diff --git a/src/Explorer/Panes/Tables/AddTableEntityPanel.test.tsx b/src/Explorer/Panes/Tables/AddTableEntityPanel.test.tsx
index d55fcbaa4..b764edaff 100644
--- a/src/Explorer/Panes/Tables/AddTableEntityPanel.test.tsx
+++ b/src/Explorer/Panes/Tables/AddTableEntityPanel.test.tsx
@@ -4,7 +4,7 @@ import React from "react";
 import TableListViewModal from "../../Tables/DataTable/TableEntityListViewModel";
 import * as Entities from "../../Tables/Entities";
 import { CassandraAPIDataClient, TablesAPIDataClient } from "../../Tables/TableDataClient";
-import QueryTablesTab from "../../Tabs/QueryTablesTab";
+import QueryTablesTab from "../../Tabs/QueryTablesTab/QueryTablesTab";
 import { AddTableEntityPanel } from "./AddTableEntityPanel";
 
 describe("Excute Add Table Entity Pane", () => {
@@ -18,6 +18,7 @@ describe("Excute Add Table Entity Pane", () => {
     queryTablesTab: fakeQueryTablesTab,
     tableEntityListViewModel: fakeTableEntityListViewModel,
     cassandraApiClient: fakeCassandraApiClient,
+    reloadEntities: () => "{}",
   };
 
   it("should render Default properly", () => {
diff --git a/src/Explorer/Panes/Tables/AddTableEntityPanel.tsx b/src/Explorer/Panes/Tables/AddTableEntityPanel.tsx
index 26f7b3f35..a2f3002c0 100644
--- a/src/Explorer/Panes/Tables/AddTableEntityPanel.tsx
+++ b/src/Explorer/Panes/Tables/AddTableEntityPanel.tsx
@@ -110,12 +110,7 @@ export const AddTableEntityPanel: FunctionComponent<AddTableEntityPanelProps> =
 
     const entity: Entities.ITableEntity = entityFromAttributes(entities);
     const newEntity: Entities.ITableEntity = await tableDataClient.createDocument(queryTablesTab.collection, entity);
-    console.log("🚀 ~ file: AddTableEntityPanel.tsx ~ line 113 ~ submit ~ newEntity", newEntity);
     await tableEntityListViewModel.addEntityToCache(newEntity);
-    console.log(
-      "🚀 ~ file: AddTableEntityPanel.tsx ~ line 116 ~ submit ~ !tryInsertNewHeaders(tableEntityListViewModel, newEntity)",
-      !tryInsertNewHeaders(tableEntityListViewModel, newEntity)
-    );
     if (!tryInsertNewHeaders(tableEntityListViewModel, newEntity)) {
       // tableEntityListViewModel.redrawTableThrottled();
       reloadEntities();
diff --git a/src/Explorer/Panes/Tables/EditTableEntityPanel.test.tsx b/src/Explorer/Panes/Tables/EditTableEntityPanel.test.tsx
index 75a28dd6e..0c3376bbf 100644
--- a/src/Explorer/Panes/Tables/EditTableEntityPanel.test.tsx
+++ b/src/Explorer/Panes/Tables/EditTableEntityPanel.test.tsx
@@ -4,7 +4,7 @@ import React from "react";
 import TableListViewModal from "../../Tables/DataTable/TableEntityListViewModel";
 import * as Entities from "../../Tables/Entities";
 import { CassandraAPIDataClient, TablesAPIDataClient } from "../../Tables/TableDataClient";
-import QueryTablesTab from "../../Tabs/QueryTablesTab";
+import QueryTablesTab from "../../Tabs/QueryTablesTab/QueryTablesTab";
 import { EditTableEntityPanel } from "./EditTableEntityPanel";
 
 describe("Excute Edit Table Entity Pane", () => {
diff --git a/src/Explorer/Panes/Tables/TableQuerySelectPanel/TableQuerySelectPanel.test.tsx b/src/Explorer/Panes/Tables/TableQuerySelectPanel/TableQuerySelectPanel.test.tsx
index 046586a50..d4c7eb975 100644
--- a/src/Explorer/Panes/Tables/TableQuerySelectPanel/TableQuerySelectPanel.test.tsx
+++ b/src/Explorer/Panes/Tables/TableQuerySelectPanel/TableQuerySelectPanel.test.tsx
@@ -1,18 +1,16 @@
 import { mount } from "enzyme";
 import * as ko from "knockout";
 import React from "react";
-import Explorer from "../../../Explorer";
 import QueryViewModel from "../../../Tables/QueryBuilder/QueryViewModel";
 import { TableQuerySelectPanel } from "./TableQuerySelectPanel";
 
 describe("Table query select Panel", () => {
-  const fakeExplorer = {} as Explorer;
   const fakeQueryViewModal = {} as QueryViewModel;
   fakeQueryViewModal.columnOptions = ko.observableArray<string>([""]);
 
   const props = {
-    explorer: fakeExplorer,
-    closePanel: (): void => undefined,
+    headers: [""],
+    getSelectMessage: () => "{}",
     queryViewModel: fakeQueryViewModal,
   };
 
diff --git a/src/Explorer/Panes/Tables/TableQuerySelectPanel/TableQuerySelectPanel.tsx b/src/Explorer/Panes/Tables/TableQuerySelectPanel/TableQuerySelectPanel.tsx
index dead9f543..826fa7e32 100644
--- a/src/Explorer/Panes/Tables/TableQuerySelectPanel/TableQuerySelectPanel.tsx
+++ b/src/Explorer/Panes/Tables/TableQuerySelectPanel/TableQuerySelectPanel.tsx
@@ -23,7 +23,6 @@ export const TableQuerySelectPanel: FunctionComponent<TableQuerySelectPanelProps
   headers,
   getSelectMessage,
 }: TableQuerySelectPanelProps): JSX.Element => {
-  console.log("🚀 ~ file: TableQuerySelectPanel.tsx ~ line 22 ~ queryViewModel", queryViewModel);
   const closeSidePanel = useSidePanel((state) => state.closeSidePanel);
 
   const [columnOptions, setColumnOptions] = useState<ISelectColumn[]>([
@@ -34,10 +33,6 @@ export const TableQuerySelectPanel: FunctionComponent<TableQuerySelectPanelProps
   const onSubmit = (): void => {
     queryViewModel.selectText(getParameters());
     queryViewModel.getSelectMessage();
-    console.log(
-      "🚀 ~ file: TableQuerySelectPanel.tsx ~ line 50 ~ onSubmit ~ queryViewModel.selectMessage()",
-      queryViewModel.selectMessage()
-    );
     getSelectMessage(queryViewModel.selectMessage());
     closeSidePanel();
   };
@@ -64,7 +59,6 @@ export const TableQuerySelectPanel: FunctionComponent<TableQuerySelectPanelProps
   useEffect(() => {
     // queryViewModel && setTableColumns(queryViewModel.columnOptions());
     headers && setTableColumns(headers);
-    console.log("🚀 ~ file: TableQuerySelectPanel.tsx ~ line 67 ~ useEffect ~ headers", headers);
   }, []);
 
   const setTableColumns = (columnNames: string[]): void => {
diff --git a/src/Explorer/Panes/Tables/TableQuerySelectPanel/__snapshots__/TableQuerySelectPanel.test.tsx.snap b/src/Explorer/Panes/Tables/TableQuerySelectPanel/__snapshots__/TableQuerySelectPanel.test.tsx.snap
index 3d429db4a..336d6affa 100644
--- a/src/Explorer/Panes/Tables/TableQuerySelectPanel/__snapshots__/TableQuerySelectPanel.test.tsx.snap
+++ b/src/Explorer/Panes/Tables/TableQuerySelectPanel/__snapshots__/TableQuerySelectPanel.test.tsx.snap
@@ -2,8 +2,12 @@
 
 exports[`Table query select Panel should render Default properly 1`] = `
 <TableQuerySelectPanel
-  closePanel={[Function]}
-  explorer={Object {}}
+  getSelectMessage={[Function]}
+  headers={
+    Array [
+      "",
+    ]
+  }
   queryViewModel={
     Object {
       "columnOptions": [Function],
@@ -647,14 +651,14 @@ exports[`Table query select Panel should render Default properly 1`] = `
             </StyledCheckboxBase>
             <StyledCheckboxBase
               checked={true}
-              disabled={true}
+              disabled={false}
               key=""
               label=""
               onChange={[Function]}
             >
               <CheckboxBase
                 checked={true}
-                disabled={true}
+                disabled={false}
                 label=""
                 onChange={[Function]}
                 styles={[Function]}
@@ -933,34 +937,34 @@ exports[`Table query select Panel should render Default properly 1`] = `
                 }
               >
                 <div
-                  className="ms-Checkbox is-checked is-disabled root-62"
+                  className="ms-Checkbox is-checked is-enabled root-54"
                 >
                   <input
                     aria-checked="true"
-                    aria-disabled={true}
+                    aria-disabled={false}
                     aria-label=""
                     checked={true}
                     className="input-55"
                     data-ktp-execute-target={true}
-                    disabled={true}
+                    disabled={false}
                     id="checkbox-0"
                     onChange={[Function]}
                     type="checkbox"
                   />
                   <label
-                    className="ms-Checkbox-label label-63"
+                    className="ms-Checkbox-label label-56"
                     htmlFor="checkbox-0"
                   >
                     <div
-                      className="ms-Checkbox-checkbox checkbox-64"
+                      className="ms-Checkbox-checkbox checkbox-57"
                       data-ktp-target={true}
                     >
                       <StyledIconBase
-                        className="ms-Checkbox-checkmark checkmark-65"
+                        className="ms-Checkbox-checkmark checkmark-58"
                         iconName="CheckMark"
                       >
                         <IconBase
-                          className="ms-Checkbox-checkmark checkmark-65"
+                          className="ms-Checkbox-checkmark checkmark-58"
                           iconName="CheckMark"
                           styles={[Function]}
                           theme={
@@ -1239,7 +1243,7 @@ exports[`Table query select Panel should render Default properly 1`] = `
                         >
                           <i
                             aria-hidden={true}
-                            className="ms-Checkbox-checkmark checkmark-67"
+                            className="ms-Checkbox-checkmark checkmark-61"
                             data-icon-name="CheckMark"
                           >
                             
diff --git a/src/Explorer/Panes/Tables/__snapshots__/AddTableEntityPanel.test.tsx.snap b/src/Explorer/Panes/Tables/__snapshots__/AddTableEntityPanel.test.tsx.snap
index cae12c746..848af98f9 100644
--- a/src/Explorer/Panes/Tables/__snapshots__/AddTableEntityPanel.test.tsx.snap
+++ b/src/Explorer/Panes/Tables/__snapshots__/AddTableEntityPanel.test.tsx.snap
@@ -4,6 +4,7 @@ exports[`Excute Add Table Entity Pane should render Default properly 1`] = `
 <AddTableEntityPanel
   cassandraApiClient={Object {}}
   queryTablesTab={Object {}}
+  reloadEntities={[Function]}
   tableDataClient={TablesAPIDataClient {}}
   tableEntityListViewModel={
     Object {
diff --git a/src/Explorer/Tabs/QueryTablesTab/QueryTablesTabComponent.tsx b/src/Explorer/Tabs/QueryTablesTab/QueryTablesTabComponent.tsx
index aaabeade8..913100838 100644
--- a/src/Explorer/Tabs/QueryTablesTab/QueryTablesTabComponent.tsx
+++ b/src/Explorer/Tabs/QueryTablesTab/QueryTablesTabComponent.tsx
@@ -446,7 +446,7 @@ class QueryTablesTabComponent extends Component<IQueryTablesTabComponentProps, I
     //eslint-disable-next-line
     const items: any[] = [];
     //eslint-disable-next-line
-    let obj: any = undefined;
+    let obj: any;
     documents.map((item) => {
       this.columns.map((col) => {
         if (item[col.name]) {
diff --git a/src/Index.tsx b/src/Index.tsx
index 03283982e..fd4095ac7 100644
--- a/src/Index.tsx
+++ b/src/Index.tsx
@@ -23,7 +23,7 @@ const Index = (): JSX.Element => {
       <header className="header HeaderBg">
         <div className="items">
           <img className="DocDBicon" src={CosmosDB_20170829} alt="Azure Cosmos DB" />
-          <a className="createdocdbacnt" href="https://aka.ms/documentdbcreate" target="_blank">
+          <a className="createdocdbacnt" href="https://aka.ms/documentdbcreate" target="_blank" rel="noreferrer">
             Create an Azure Cosmos DB account <img className="rightarrowimg" src={Arrow} alt="" />
           </a>
           <span className="title">Azure Cosmos DB Emulator</span>