diff --git a/ProductFunctionTester/Main_Form.vb b/ProductFunctionTester/Main_Form.vb
index f69ac73..9f69884 100644
--- a/ProductFunctionTester/Main_Form.vb
+++ b/ProductFunctionTester/Main_Form.vb
@@ -229,7 +229,7 @@ Public Class Main_Form
         Public Test_HFData() As Double
         Public Test_HFInterval() As Single
         Public Test_RFVRMS() As Single
-        Public Test_RFFreq() As Int16
+        Public Test_RFFreq() As Double
         Public Test_RFPWidth() As Single
         Public Test_RFNWidth() As Single
         Public Test_MCVpp() As Single
@@ -2209,20 +2209,19 @@ Public Class Main_Form
         End If
 
         For i = 0 To tableName.Length - 1
-            DBCmd = "SELECT COUNT(PV_SN) FROM " & tableName(i) & " WHERE PV_SN = '" & TestData.Test_Serial & "'" &
-            " AND DATE(TestDate) = CURDATE()"
-
-            Dim DupYn As Int16 = DBQueryScalar(DBCmd)
 
             If formType = formTypeList.prdRFMC Then
-                DBCmd = "SELECT COUNT(RF_R1Vrms) FROM " & tableName(i) & " WHERE PV_SN = '" & TestData.Test_Serial & "'" & " AND DATE(TestDate) = CURDATE()"
+                DBCmd = "SELECT IFNULL(RF_R1Vrms,0) FROM " & tableName(i) & " WHERE PV_SN = '" & TestData.Test_Serial & "'" & " AND DATE(TestDate) = CURDATE()"
 
-                Dim DupRFMCYn As Int16 = DBQueryScalar(DBCmd)
-                If DupRFMCYn = 0 Then
-                    DupYn = 0
-                End If
+            ElseIf formType = formTypeList.prdEP Then
+                DBCmd = "SELECT IFNULL(EP_R1Vpp,0) FROM " & tableName(i) & " WHERE PV_SN = '" & TestData.Test_Serial & "'" & " AND DATE(TestDate) = CURDATE()"
+            Else
+                DBCmd = "SELECT COUNT(PV_SN) FROM " & tableName(i) & " WHERE PV_SN = '" & TestData.Test_Serial & "'" &
+           " AND DATE(TestDate) = CURDATE()"
             End If
 
+            Dim DupYn As Int16 = DBQueryScalar(DBCmd)
+
             If DupYn > 0 Then
 
                 If tableName(i) = hfTableNow Then
@@ -2850,7 +2849,7 @@ SettingFailLDM:
                     GoTo forSettingFail
                 End If
 
-                TestData.Test_RFFreq(i) = Convert.ToDouble(ScopeData).ToString("f12") / 1000000
+                TestData.Test_RFFreq(i) = Convert.ToDouble(ScopeData) / 1000000
 
                 If formType = formTypeList.prdVRLDM Then
                     If (TestData.Test_RFVRMS(i) < CSng(LDMt_VRMSmin(i).Text) Or TestData.Test_RFVRMS(i) > CSng(LDMt_VRMSMax(i).Text)) Or Round(TestData.Test_RFFreq(i), 0) <> i + 1 Then