diff --git a/BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj b/BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj
index f6f527c..ceab29f 100644
--- a/BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj
+++ b/BWP.B3_YunKen.Web/BWP.B3_YunKen.Web.csproj
@@ -189,7 +189,7 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Pages\B3YunKen\Dialogs\ProductionCompletionDialog.xml" />
+    <EmbeddedResource Include="Pages\B3YunKen\Dialogs\ProductionCompletionDialog.xml" />
     <EmbeddedResource Include="Pages\B3YunKen\Reports\ProduceFinishDiffReport.xml" />
   </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
diff --git a/BWP.B3_YunKen.Web/Pages/B3YunKen/Dialogs/ProductionCompletionDialog.xml b/BWP.B3_YunKen.Web/Pages/B3YunKen/Dialogs/ProductionCompletionDialog.xml
index 6ea213e..57197ec 100644
--- a/BWP.B3_YunKen.Web/Pages/B3YunKen/Dialogs/ProductionCompletionDialog.xml
+++ b/BWP.B3_YunKen.Web/Pages/B3YunKen/Dialogs/ProductionCompletionDialog.xml
@@ -37,10 +37,14 @@
         <Field name="Employee_ID"/>
         <QBE paramName="Employee_ID"/>
       </EQ>
-      <Contains>
+      <GreaterThanOrEqual>
         <Field name="Date"/>
-        <QBE paramName="Date"/>
-      </Contains>
+        <QBE paramName="MinDate" />
+      </GreaterThanOrEqual>
+      <LessThanOrEqual>
+        <Field name="Date"/>
+        <QBE paramName="MaxDate"/>
+      </LessThanOrEqual>
     </And>
   </Where>
 </Select>