diff --git a/LSL2/STPROC/SCAN_SERVICES.txt b/LSL2/STPROC/SCAN_SERVICES.txt
index 89259ad..d74f480 100644
--- a/LSL2/STPROC/SCAN_SERVICES.txt
+++ b/LSL2/STPROC/SCAN_SERVICES.txt
@@ -279,21 +279,22 @@ Service ProcessScanData(ScanID, ScanJSON)
                             Case ScanData[1, 4] EQ '1TTW'
                                 ValidTWLot                     = False$
                                 If RowExists('LOT', LotId) then
-                                    Locate LotId in ScansRow<SCANS.TW_LOT_ID$> using @VM setting twPos then
+                                    TWLots = ScansRow<SCANS.TW_LOT_ID$>
+                                    Locate LotId in TWLots using @VM setting twPos then
                                             Error_Services('Add', LotID : ' has already been added as a test wafer lot being used.')
-                                        end else
-                                            LotCurrentOperation = Lot_Services('GetLotCurrOperationName', LotId)
-                                            If LotCurrentOperation NE 'TW_CREATE' AND LotCurrentOperation NE 'TW_CLOSE' then
-                                                LotCurrWfrQty = Database_Services('ReadDataColumn', 'LOT', LotId, LOT_WAFER_QTY$, True$, 0, False$)
-                                                If LotCurrWfrQty GT 0 then
-                                                    ScansRow<SCANS.TW_LOT_ID$, -1> = LotID
-                                                end else
-                                                    Error_Services('Add', LotID : ' does not have enough wafers to be used.')
-                                                end
+                                    end else
+                                        LotCurrentOperation = Lot_Services('GetLotCurrOperationName', LotId)
+                                        If LotCurrentOperation NE 'TW_CREATE' AND LotCurrentOperation NE 'TW_CLOSE' then
+                                            LotCurrWfrQty = Database_Services('ReadDataColumn', 'LOT', LotId, LOT_WAFER_QTY$, True$, 0, False$)
+                                            If LotCurrWfrQty GT 0 then
+                                                ScansRow<SCANS.TW_LOT_ID$, -1> = LotID
                                             end else
-                                                Error_Services('Add', LotID : ' is not at a valid operation for use.')
+                                                Error_Services('Add', LotID : ' does not have enough wafers to be used.')
                                             end
+                                        end else
+                                            Error_Services('Add', LotID : ' is not at a valid operation for use.')
                                         end
+                                    end
                                 end else
                                     Error_Services('Add', LotID : ' is not a valid test wafer lot ID.')
                                 end
@@ -534,6 +535,8 @@ Service ProcessScanData(ScanID, ScanJSON)
                     Case ScanData[1, 17] EQ 'TESTRUNTYPEUPDATE'
                         TestRunTypeId                     = Field(ScanData, '|', 2)
                         ScansRow<SCANS.TEST_RUN_TYPE_ID$> = TestRunTypeId
+                        //ScansRow<SCANS.TEST_RUN_TYPE_NAME$> = TestRunTypeName
+                        
                     Case ScanData EQ ''
                         // Most likely receiving RDS data, so nothing to do here.
                         Null
@@ -1082,6 +1085,7 @@ Service ProcessScanData(ScanID, ScanJSON)
                                             Abort            = False$
                                             for each TWLot in TestWaferLotData using @VM setting twPOS
                                                 If ScansRow<SCANS.TW_LOT_QTY$, twPOS> NE '' OR ScansRow<SCANS.TW_LOT_QTY$, twPOS> GT 0 then
+
                                                     TWLotCurrOperation = Lot_Services('GetLotCurrOperationName', TWLot)
                                                     If TWLotCurrOperation NE 'TW_CREATE' AND TWLotCurrOperation NE 'TW_CLOSE' then
                                                         TWLotCurrOpen = Database_Services('ReadDataColumn', 'LOT', TWLot, LOT_OPEN$, True$, 0, False$)
@@ -1520,10 +1524,12 @@ Service ConvertMVScanToJSON(ScanID, mvScan, itemURL)
                     SRP_JSON(objScan, 'SetValue', 'type', {SCAN_TYPE}, 'String')
                     SRP_JSON(objScan, 'SetValue', 'action', {ACTION}, 'String')
                     SRP_JSON(objScan, 'SetValue', 'testRunTypeId', {TEST_RUN_TYPE_ID}, 'Integer')
-                    SRP_JSON(objScan, 'SetValue', 'testRunTypeName', XLate('TEST_RUN_TYPE', {TEST_RUN_TYPE_ID}, TEST_RUN_TYPE_RUN_TYPE$, 'X'), 'String')
+                    
                     SRP_JSON(objScan, 'SetValue', 'acceptable', {ACCEPTABLE}, 'Boolean')
                     SRP_JSON(objScan, 'SetValue', 'notAcceptableReason', {NOT_ACCEPTABLE_REASON}, 'String')
                     SRP_JSON(objScan, 'SetValue', 'result', {RESULT}, 'String')
+                    SRP_JSON(objScan, 'SetValue', 'testRunTypeId', {TEST_RUN_TYPE_ID}, 'Integer')
+                    SRP_JSON(objScan, 'SetValue', 'testRunTypeName', XLate('TEST_RUN_TYPE', {TEST_RUN_TYPE_ID}, TEST_RUN_TYPE_RUN_TYPE$, 'X'), 'String')
                     If SRP_JSON(arrayScanLog, 'New', 'Array') then
                         If {SCANNED_DATES} NE '' then
                             ScannedDates    = {SCANNED_DATES}
@@ -2014,22 +2020,24 @@ Service ConvertJSONScanToMV(jsonScan)
     If jsonScan NE '' then
         If SRP_JSON(objJSONScan, 'Parse', jsonScan) EQ '' then
             
-            mvScan<SCANS.CREATED_DATE$>             = SRP_JSON(objJSONScan, 'GetValue', 'created.date')
-            mvScan<SCANS.CREATED_TIME$>             = SRP_JSON(objJSONScan, 'GetValue', 'created.time')
-            mvScan<SCANS.SCAN_TYPE$>                = SRP_JSON(objJSONScan, 'GetValue', 'scan.type')
-            mvScan<SCANS.EMPLOYEE_ID$>              = SRP_JSON(objJSONScan, 'GetValue', 'employee.ID')
-            mvScan<SCANS.LOCATION_ID$>              = SRP_JSON(objJSONScan, 'GetValue', 'location.ID')
-            mvScan<SCANS.TOOL_ID$>                  = SRP_JSON(objJSONScan, 'GetValue', 'tool.ID')
-            mvScan<SCANS.LOAD_LOCK$>                = SRP_JSON(objJSONScan, 'GetValue', 'tool.loadLock')
-            mvScan<SCANS.ACCEPTED$>                 = SRP_JSON(objJSONScan, 'GetValue', 'accepted.status', False$)
-            mvScan<SCANS.ACCEPTED_DATE$>            = SRP_JSON(objJSONScan, 'GetValue', 'accepted.date')
-            mvScan<SCANS.ACCEPTED_TIME$>            = SRP_JSON(objJSONScan, 'GetValue', 'accepted.time')
-            mvScan<SCANS.ACTION$>                   = SRP_JSON(objJSONScan, 'GetValue', 'action')
-            mvScan<SCANS.WAFER_COUNT_CONFIRMED$>    = SRP_JSON(objJSONScan, 'GetValue', 'waferCount.confirmed', False$)
-            mvScan<SCANS.BOAT_ID$>                  = SRP_JSON(objJSONScan, 'GetValue', 'transfer.boatID')
-            mvScan<SCANS.PL_NUMBER$>                = SRP_JSON(objJSONScan, 'GetValue', 'transfer.plNumber')
-            mvScan<SCANS.UNLOAD_PL_CONFIRMED$>      = SRP_JSON(objJSONScan, 'GetValue', 'transfer.unloadplConfirmed', False$)
-            mvScan<SCANS.TRANSFER_TOOL_ID$>         = SRP_JSON(objJSONScan, 'GetValue', 'transfer.tool.ID')
+            mvScan<SCANS.CREATED_DATE$>          = SRP_JSON(objJSONScan, 'GetValue', 'created.date')
+            mvScan<SCANS.CREATED_TIME$>          = SRP_JSON(objJSONScan, 'GetValue', 'created.time')
+            mvScan<SCANS.SCAN_TYPE$>             = SRP_JSON(objJSONScan, 'GetValue', 'scan.type')
+            mvScan<SCANS.EMPLOYEE_ID$>           = SRP_JSON(objJSONScan, 'GetValue', 'employee.ID')
+            mvScan<SCANS.LOCATION_ID$>           = SRP_JSON(objJSONScan, 'GetValue', 'location.ID')
+            mvScan<SCANS.TOOL_ID$>               = SRP_JSON(objJSONScan, 'GetValue', 'tool.ID')
+            mvScan<SCANS.LOAD_LOCK$>             = SRP_JSON(objJSONScan, 'GetValue', 'tool.loadLock')
+            mvScan<SCANS.ACCEPTED$>              = SRP_JSON(objJSONScan, 'GetValue', 'accepted.status', False$)
+            mvScan<SCANS.ACCEPTED_DATE$>         = SRP_JSON(objJSONScan, 'GetValue', 'accepted.date')
+            mvScan<SCANS.ACCEPTED_TIME$>         = SRP_JSON(objJSONScan, 'GetValue', 'accepted.time')
+            mvScan<SCANS.ACTION$>                = SRP_JSON(objJSONScan, 'GetValue', 'action')
+            mvScan<SCANS.WAFER_COUNT_CONFIRMED$> = SRP_JSON(objJSONScan, 'GetValue', 'waferCount.confirmed', False$)
+            mvScan<SCANS.BOAT_ID$>               = SRP_JSON(objJSONScan, 'GetValue', 'transfer.boatID')
+            mvScan<SCANS.PL_NUMBER$>             = SRP_JSON(objJSONScan, 'GetValue', 'transfer.plNumber')
+            mvScan<SCANS.UNLOAD_PL_CONFIRMED$>   = SRP_JSON(objJSONScan, 'GetValue', 'transfer.unloadplConfirmed', False$)
+            mvScan<SCANS.TRANSFER_TOOL_ID$>      = SRP_JSON(objJSONScan, 'GetValue', 'transfer.tool.ID')
+            mvScan<SCANS.TEST_RUN_TYPE_ID$>      = SRP_JSON(objJSONScan, 'GetValue', 'scan.testRunTypId')
+            mvScan<SCANS.TEST_RUN_TYPE_NAME$>    = SRP_JSON(objJSONScan, 'GetValue', 'scan.testRunTypeName')
             
             arrayCassettes  = SRP_JSON(objJSONScan, 'Get', 'cassetteIDs')
             NumCassettes    = SRP_JSON(arrayCassettes, 'GetCount')
@@ -2233,3 +2241,4 @@ ClearCursors:
     Next counter
     
 return
+
diff --git a/LSL2/STPROCINS/SCANS_EQUATES.txt b/LSL2/STPROCINS/SCANS_EQUATES.txt
index a45950e..b0a1b61 100644
--- a/LSL2/STPROCINS/SCANS_EQUATES.txt
+++ b/LSL2/STPROCINS/SCANS_EQUATES.txt
@@ -39,5 +39,7 @@ compile insert SCANS_EQUATES
    equ SCANS.TW_LOT_ID$             to 30
    equ SCANS.TW_LOT_QTY$            to 31
    equ SCANS.TEST_RUN_TYPE_ID$      to 32
+   equ SCANS.TEST_RUN_TYPE_NAME$    to 33
 
 #endif
+