diff --git a/src/common/customizations/postgresql.js b/src/common/customizations/postgresql.js
index ed495e24..3b8aefc5 100644
--- a/src/common/customizations/postgresql.js
+++ b/src/common/customizations/postgresql.js
@@ -19,7 +19,7 @@ module.exports = {
    schedulers: false,
    // Settings
    databaseEdit: false,
-   tableSettings: true,
+   tableSettings: false,
    viewSettings: false,
    triggerSettings: false,
    routineSettings: false,
diff --git a/src/main/libs/clients/PostgreSQLClient.js b/src/main/libs/clients/PostgreSQLClient.js
index 10af991b..ea424b10 100644
--- a/src/main/libs/clients/PostgreSQLClient.js
+++ b/src/main/libs/clients/PostgreSQLClient.js
@@ -1267,8 +1267,8 @@ export class PostgreSQLClient extends AntaresCore {
 
                      queryResult = rows.map(row => {
                         return row.reduce((acc, curr, i) => {
-                           const table = tablesInfo[fields[i].tableID].table;
-                           acc[`${table}.${fields[i].name}`] = curr;
+                           const table = tablesInfo[fields[i].tableID] ? tablesInfo[fields[i].tableID].table : '';
+                           acc[`${table ? `${table}.` : ''}${fields[i].name}`] = curr;
                            return acc;
                         }, {});
                      });
diff --git a/src/renderer/components/WorkspaceQueryTableRow.vue b/src/renderer/components/WorkspaceQueryTableRow.vue
index 93868436..7ef4b275 100644
--- a/src/renderer/components/WorkspaceQueryTableRow.vue
+++ b/src/renderer/components/WorkspaceQueryTableRow.vue
@@ -412,7 +412,13 @@ export default {
          this.isInlineEditor[this.editingField] = false;
          let content;
          if (!BLOB.includes(this.editingType)) {
+            if ([...DATETIME, ...TIME].includes(this.editingType)) {
+               if (this.editingContent.substring(this.editingContent.length - 1) === '.')
+                  this.editingContent = this.editingContent.slice(0, -1);
+            }
+
             if (this.editingContent === this.$options.filters.typeFormat(this.originalContent, this.editingType, this.editingLength)) return;// If not changed
+
             content = this.editingContent;
          }
          else { // Handle file upload