diff --git a/eXperDB_Monitoring_Client/iDast.MonPostgres/frmConnection.Designer.vb b/eXperDB_Monitoring_Client/iDast.MonPostgres/frmConnection.Designer.vb
index 9e93dac..d63c36f 100644
--- a/eXperDB_Monitoring_Client/iDast.MonPostgres/frmConnection.Designer.vb
+++ b/eXperDB_Monitoring_Client/iDast.MonPostgres/frmConnection.Designer.vb
@@ -31,6 +31,7 @@ Partial Class frmConnection
         Me.btnAct = New eXperDB.BaseControls.Button()
         Me.btnTest = New eXperDB.BaseControls.Button()
         Me.tlpSvrChk = New System.Windows.Forms.TableLayoutPanel()
+        Me.chkReScanStmt = New eXperDB.BaseControls.CheckBox()
         Me.cmbSnapPeriod = New eXperDB.BaseControls.ComboBox()
         Me.lblSnapPeriod = New eXperDB.BaseControls.Label()
         Me.lblHAREPLHost = New eXperDB.BaseControls.Label()
@@ -63,7 +64,6 @@ Partial Class frmConnection
         Me.lblPort = New eXperDB.BaseControls.Label()
         Me.txtIP = New eXperDB.BaseControls.TextBox()
         Me.txtPort = New eXperDB.BaseControls.TextBox()
-        Me.chkReScanStmt = New eXperDB.BaseControls.CheckBox()
         Me.TableLayoutPanel2.SuspendLayout()
         Me.TableLayoutPanel3.SuspendLayout()
         Me.tlpSvrChk.SuspendLayout()
@@ -256,6 +256,24 @@ Partial Class frmConnection
         Me.tlpSvrChk.Size = New System.Drawing.Size(365, 591)
         Me.tlpSvrChk.TabIndex = 20
         '
+        'chkReScanStmt
+        '
+        Me.chkReScanStmt.AutoSize = True
+        Me.chkReScanStmt.CheckFillColor = System.Drawing.Color.FromArgb(CType(CType(127, Byte), Integer), CType(CType(127, Byte), Integer), CType(CType(127, Byte), Integer))
+        Me.chkReScanStmt.Dock = System.Windows.Forms.DockStyle.Bottom
+        Me.chkReScanStmt.Font = New System.Drawing.Font("Gulim", 9.0!, System.Drawing.FontStyle.Bold)
+        Me.chkReScanStmt.ForeColor = System.Drawing.Color.White
+        Me.chkReScanStmt.LineColor = System.Drawing.Color.Gray
+        Me.chkReScanStmt.Location = New System.Drawing.Point(282, 276)
+        Me.chkReScanStmt.Name = "chkReScanStmt"
+        Me.chkReScanStmt.Radius = 10
+        Me.chkReScanStmt.Size = New System.Drawing.Size(74, 16)
+        Me.chkReScanStmt.TabIndex = 27
+        Me.chkReScanStmt.Text = "ReScan"
+        Me.chkReScanStmt.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
+        Me.chkReScanStmt.UnCheckFillColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer))
+        Me.chkReScanStmt.UseVisualStyleBackColor = True
+        '
         'cmbSnapPeriod
         '
         Me.cmbSnapPeriod.BackColor = System.Drawing.SystemColors.Window
@@ -751,6 +769,7 @@ Partial Class frmConnection
         Me.txtIP.ImeMode = System.Windows.Forms.ImeMode.NoControl
         Me.txtIP.impossibleinput = ""
         Me.txtIP.Location = New System.Drawing.Point(136, 26)
+        Me.txtIP.MaxByteLength = 127
         Me.txtIP.Name = "txtIP"
         Me.txtIP.Necessary = False
         Me.txtIP.PossibleInput = ""
@@ -778,24 +797,6 @@ Partial Class frmConnection
         Me.txtPort.TabIndex = 1
         Me.txtPort.Value = "0"
         '
-        'chkReScanStmt
-        '
-        Me.chkReScanStmt.AutoSize = True
-        Me.chkReScanStmt.CheckFillColor = System.Drawing.Color.FromArgb(CType(CType(127, Byte), Integer), CType(CType(127, Byte), Integer), CType(CType(127, Byte), Integer))
-        Me.chkReScanStmt.Dock = System.Windows.Forms.DockStyle.Bottom
-        Me.chkReScanStmt.Font = New System.Drawing.Font("Gulim", 9.0!, System.Drawing.FontStyle.Bold)
-        Me.chkReScanStmt.ForeColor = System.Drawing.Color.White
-        Me.chkReScanStmt.LineColor = System.Drawing.Color.Gray
-        Me.chkReScanStmt.Location = New System.Drawing.Point(282, 276)
-        Me.chkReScanStmt.Name = "chkReScanStmt"
-        Me.chkReScanStmt.Radius = 10
-        Me.chkReScanStmt.Size = New System.Drawing.Size(74, 16)
-        Me.chkReScanStmt.TabIndex = 27
-        Me.chkReScanStmt.Text = "ReScan"
-        Me.chkReScanStmt.TextAlign = System.Drawing.ContentAlignment.MiddleCenter
-        Me.chkReScanStmt.UnCheckFillColor = System.Drawing.Color.FromArgb(CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer), CType(CType(64, Byte), Integer))
-        Me.chkReScanStmt.UseVisualStyleBackColor = True
-        '
         'frmConnection
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(96.0!, 96.0!)
diff --git a/eXperDB_Server/eXperDB_Monitoring_Agent/src/sqlMapper/app.xml b/eXperDB_Server/eXperDB_Monitoring_Agent/src/sqlMapper/app.xml
index cbc1aca..ab328b6 100644
--- a/eXperDB_Server/eXperDB_Monitoring_Agent/src/sqlMapper/app.xml
+++ b/eXperDB_Server/eXperDB_Monitoring_Agent/src/sqlMapper/app.xml
@@ -471,7 +471,7 @@ SELECT /* EXPERDBMABT_TABLE_INFO_001 24e9ab7301ff1966da4fb30dc1538882 */
 												            LEFT JOIN pg_class AS toast ON tbl.reltoastrelid = toast.oid
 										          WHERE att.attnum > 0 AND NOT att.attisdropped
 										            AND tbl.relkind = 'r'
-										          GROUP BY 1,2,3,4,5,6,7,8,9,10, tbl.relhasoids,15,16,17
+										          GROUP BY 1,2,3,4,5,6,7,8,9,10,15,16,17
 										          ORDER BY 2,3
 				       ) AS s 
 				       JOIN PG_STAT_USER_TABLES UTB ON UTB.relname=s.tblname AND UTB.schemaname = s.schemaname