diff --git a/LSL2/STPROC/QA_SERVICES.txt b/LSL2/STPROC/QA_SERVICES.txt
index 8e7c570..8cbb1dd 100644
--- a/LSL2/STPROC/QA_SERVICES.txt
+++ b/LSL2/STPROC/QA_SERVICES.txt
@@ -1187,7 +1187,7 @@ return
 
 
 Service ProcessWaferImageRequests()
-    
+
     hSysLists   = Database_Services('GetTableHandle', 'SYSLISTS')
     Lock hSysLists, ServiceKeyID then
         hWaferImageRequests = Database_Services('GetTableHandle', 'WAFER_IMAGE_REQUESTS')
@@ -1218,12 +1218,7 @@ Service ProcessWaferImageRequests()
                         Reactor      = Xlate('RDS', RDSNo, 'REACTOR', 'X')
                         PSN          = Xlate('RDS', RDSNo, 'PROD_SPEC_ID', 'X')
                         // Format Wafer Number for SQL Query
-                        WaferNo      = TrimF(WaferNo)
-                        If WaferNo < 10 then
-                            WaferNo  = '*0' : WaferNo
-                        end else
-                            WaferNo  = '*' : WaferNo
-                        end
+                        WaferNo = Fmt(TrimF(WaferNo), 'R(0)#2')
                         Query = "DECLARE @RDS         varchar(10) "                                                     |
                               : "DECLARE @RECIPE      varchar(30) "                                                     |
                               : "DECLARE @WFRID       varchar(10) "                                                     |
@@ -1245,7 +1240,7 @@ Service ProcessWaferImageRequests()
                         InsertDate   = InsertDTM[1, 'F ']
                         Year         = Field(InsertDate, '/', 3, 1) 
                         WorkWeek     = 'WW':Date_Services('GetWeekNum', InsertDate)
-                        PDFPath      = WaferMapRoot:'_\':Year:'\':WorkWeek:'\':AttachmentID:'\image.pdf'
+                        PDFPath      = WaferMapRoot:'\':Year:'\':WorkWeek:'\':AttachmentID:'\image.pdf'
                         Set_Status(0)
                         PDFFile      = ''
                         OSRead PDFFile from PDFPath then
@@ -2188,7 +2183,7 @@ Service LoadSignatureReady(RDSNo, Username, WaferQty, LLSide, PreFlag, ReactNoOp
             return
         end            
     end
-    
+
     // Ensure recipe parameters (RDS Layer parameters) have been manually entered or automatically applied.
     LSParmsComp = Xlate('RDS', RDSNo, 'LS_PARMS_COMP', 'X')
     Buf1        = DCount(LSParmsComp, @VM)
@@ -2220,7 +2215,8 @@ Service LoadSignatureReady(RDSNo, Username, WaferQty, LLSide, PreFlag, ReactNoOp
 *        end
 * 	end
     Locate True$ in ParamOutOfSpec using @VM setting oPos then
-		IF Supplement NE True$ then
+    	
+		IF Supplement NE True$ AND WONo NE '173485' then
             ErrorMsg = 'Process Error: Recipe parameters are out of spec and no supplement has been set.'
             Error_Services('Set', ErrorMsg)
             Response = False$