diff --git a/src/main/libs/clients/MySQLClient.js b/src/main/libs/clients/MySQLClient.js
index 7787e5e6..8402145e 100644
--- a/src/main/libs/clients/MySQLClient.js
+++ b/src/main/libs/clients/MySQLClient.js
@@ -335,11 +335,11 @@ export class MySQLClient extends AntaresCore {
          .select('*')
          .schema('information_schema')
          .from('COLUMNS')
-         .where({ TABLE_SCHEMA: `= '${this._schema || schema}'`, TABLE_NAME: `= '${table}'` })
+         .where({ TABLE_SCHEMA: `= '${schema}'`, TABLE_NAME: `= '${table}'` })
          .orderBy({ ORDINAL_POSITION: 'ASC' })
          .run();
 
-      const { rows: fields } = await this.raw(`SHOW CREATE TABLE \`${this._schema || schema}\`.\`${table}\``);
+      const { rows: fields } = await this.raw(`SHOW CREATE TABLE \`${schema}\`.\`${table}\``);
 
       const remappedFields = fields.map(row => {
          if (!row['Create Table']) return false;
diff --git a/src/renderer/components/Workspace.vue b/src/renderer/components/Workspace.vue
index 5244d7ac..b505826f 100644
--- a/src/renderer/components/Workspace.vue
+++ b/src/renderer/components/Workspace.vue
@@ -147,11 +147,7 @@
             :connection="connection"
             :scheduler="workspace.breadcrumbs.scheduler"
          /> -->
-         <div
-            v-for="tab of workspace.tabs"
-            :key="tab.uid"
-            class="column col-12"
-         >
+         <template v-for="tab of workspace.tabs">
             <WorkspaceQueryTab
                v-if="tab.type==='query'"
                :key="tab.uid"
@@ -161,13 +157,13 @@
             />
             <WorkspaceTableTab
                v-else-if="tab.type==='temp-data'"
-               v-show="selectedTab === tab.uid"
-               :is-selected="selectedTab === tab.uid"
+               :key="tab.uid"
                :connection="connection"
+               :is-selected="selectedTab === tab.uid"
                :table="tab.table"
                :schema="tab.schema"
             />
-         </div>
+         </template>
       </div>
       <WorkspaceEditConnectionPanel v-else :connection="connection" />
       <ModalProcessesList
diff --git a/src/renderer/components/WorkspaceExploreBarSchema.vue b/src/renderer/components/WorkspaceExploreBarSchema.vue
index 75714882..2d64bf7d 100644
--- a/src/renderer/components/WorkspaceExploreBarSchema.vue
+++ b/src/renderer/components/WorkspaceExploreBarSchema.vue
@@ -282,7 +282,7 @@ export default {
       },
       selectTable ({ schema, table }) {
          this.setBreadcrumbs({ schema, [table.type]: table.name });
-         // TODO: open only if not present
+         // TODO: open only if not already opened
          this.newTab({ uid: this.connection.uid, table: table.name, schema: this.database.name, type: 'temp-data' });
       },
       showSchemaContext (event, schema) {
diff --git a/src/renderer/components/WorkspaceQueryTab.vue b/src/renderer/components/WorkspaceQueryTab.vue
index 4e3d3d0d..c5388ce4 100644
--- a/src/renderer/components/WorkspaceQueryTab.vue
+++ b/src/renderer/components/WorkspaceQueryTab.vue
@@ -156,6 +156,9 @@ export default {
       workspace () {
          return this.getWorkspace(this.connection.uid);
       },
+      schema () {
+         return this.workspace.breadcrumbs.schema;
+      },
       isWorkspaceSelected () {
          return this.workspace.uid === this.selectedWorkspace;
       }
diff --git a/src/renderer/components/WorkspaceTableTab.vue b/src/renderer/components/WorkspaceTableTab.vue
index 99631119..db3deea3 100644
--- a/src/renderer/components/WorkspaceTableTab.vue
+++ b/src/renderer/components/WorkspaceTableTab.vue
@@ -1,5 +1,5 @@
 <template>
-   <div v-show="isSelected" class="workspace-query-tab column col-12 columns col-gapless p-0">
+   <div v-show="isSelected" class="workspace-query-tab column col-12 columns col-gapless no-outline p-0">
       <div class="workspace-query-runner column col-12">
          <div class="workspace-query-runner-footer">
             <div class="workspace-query-buttons">
@@ -181,7 +181,9 @@ export default {
    mixins: [tableTabs],
    props: {
       connection: Object,
-      table: String
+      isSelected: Boolean,
+      table: String,
+      schema: String
    },
    data () {
       return {
@@ -208,9 +210,6 @@ export default {
       workspace () {
          return this.getWorkspace(this.connection.uid);
       },
-      isSelected () {
-         return this.workspace.selected_tab === 'data' && this.workspace.uid === this.selectedWorkspace;
-      },
       isTable () {
          return !!this.workspace.breadcrumbs.table;
       },
@@ -282,7 +281,7 @@ export default {
          const params = {
             uid: this.connection.uid,
             schema: this.schema,
-            table: this.workspace.breadcrumbs.table || this.workspace.breadcrumbs.view,
+            table: this.table,
             limit: this.limit,
             page: this.page,
             sortParams
diff --git a/src/renderer/mixins/tableTabs.js b/src/renderer/mixins/tableTabs.js
index 3477f54e..953d3e45 100644
--- a/src/renderer/mixins/tableTabs.js
+++ b/src/renderer/mixins/tableTabs.js
@@ -1,11 +1,6 @@
 import Tables from '@/ipc-api/Tables';
 
 export default {
-   computed: {
-      schema () {
-         return this.workspace.breadcrumbs.schema;
-      }
-   },
    methods: {
       async updateField (payload) {
          this.isQuering = true;
diff --git a/src/renderer/store/modules/workspaces.store.js b/src/renderer/store/modules/workspaces.store.js
index 45e0a87d..f606353b 100644
--- a/src/renderer/store/modules/workspaces.store.js
+++ b/src/renderer/store/modules/workspaces.store.js
@@ -480,7 +480,7 @@ export default {
             const tempTabs = workspaceTabs ? workspaceTabs.tabs.filter(tab => tab.type === 'temp-data') : false;
             if (tempTabs) {
                for (const tab of tempTabs)
-                  commit('REMOVE_TAB', { uid, tab: tab.uid });
+                  commit('REMOVE_TAB', { uid, tab: tab.uid });// TODO: replace instead remove
             }
          }