diff --git a/db/queries/mssql.py b/db/queries/mssql.py
index 75a5ff5..3c996e4 100644
--- a/db/queries/mssql.py
+++ b/db/queries/mssql.py
@@ -15,8 +15,8 @@
     },
     "system": {
         "schema_no_system": """
-                select
-                    table_name
+                select table_schema
+                    , table_name
                     , column_name
                     , data_type
                 from
@@ -25,16 +25,16 @@
                     table_schema not in ('information_schema', 'sys')
                 """,
         "schema_with_system": """
-                select
-                    table_name
+                select table_schema
+                    , table_name
                     , column_name
                     , data_type
                 from
                     information_schema.columns;
                 """,
         "schema_specified": """
-                select
-                    table_name
+                select table_schema
+                    , table_name
                     , column_name
                     , data_type
                 from