diff --git a/LSL2/STPROC/METROLOGY_SERVICES.txt b/LSL2/STPROC/METROLOGY_SERVICES.txt
index dd54b96..f5d6a25 100644
--- a/LSL2/STPROC/METROLOGY_SERVICES.txt
+++ b/LSL2/STPROC/METROLOGY_SERVICES.txt
@@ -190,7 +190,7 @@ Service ImportMetrologyFiles(Machine)
 	If Machine NE '' then
 		hSysLists       = Database_Services('GetTableHandle', 'SYSLISTS')
 		Lock hSysLists, ServiceKeyID:'*':Machine then
-			
+
 			********************************
 			* Verify Metrology data folder *
 			********************************
@@ -1531,6 +1531,7 @@ Service ImportHgCVData(RunData, FileName)
 										// the data has already been written to the database in the above logic. In all other cases, the
 										// data needs to be written to the database using the following logic that works off of the test
 										// point map.
+										DataPoints = HgCVDataPoints
 										GoSub LoadRunDataToDatabase
 									end
 								end else
@@ -2373,18 +2374,18 @@ Service GetIQSViolations()
 	
 	hSysLists   = Database_Services('GetTableHandle', 'SYSLISTS')
 	Lock hSysLists, ServiceKeyID then
-		Response = 0
-		ParsedIQSData = ''
-		Pass     = 1
+		Response         = 0
+		ParsedIQSData    = ''
+		Pass             = 1
 		//URL      = "https://oi-metrology-viewer-prod.mes.infineon.com:4432/product-thick-and-res-health-reduced-web.html"
-		URL = "https://messa020ec.infineon.com:4438/product-thick-and-res-health-reduced-web.html"
-		TimeoutDuration = HTTPClient_Services('GetTimeoutDuration')
+		URL              = "https://messa020ec.infineon.com:4438/product-thick-and-res-health-reduced-web.html"
+		TimeoutDuration  = HTTPClient_Services('GetTimeoutDuration')
 		If TimeoutDuration NE 30 then Httpclient_Services('SetTimeoutDuration', 30)
-		IQSResponse     = Httpclient_Services('SendHTTPRequest', 'GET', URL, '', '', '', '', '', '', '')
+		IQSResponse      = Httpclient_Services('SendHTTPRequest', 'GET', URL, '', '', '', '', '', '', '')
 		swap CRLF$ with '' in IQSResponse
 		PublishDateStart = Indexc(IQSResponse, 'Published: ', 1) + 11
-		PublishDateCnt = Indexc(IQSResponse, '</p>', 1) - PublishDateStart
-		PublishDate = IQSResponse[PublishDateStart, PublishDateCnt]
+		PublishDateCnt   = Indexc(IQSResponse, '</p>', 1) - PublishDateStart
+		PublishDate      = IQSResponse[PublishDateStart, PublishDateCnt]
 		
 		swap ' AM' with 'AM' in PublishDate
 		swap ' PM' with 'PM' in PublishDate