diff --git a/client/app/components/queries/schema-browser.html b/client/app/components/queries/schema-browser.html
index 7c47019d62..7d0a950f2c 100644
--- a/client/app/components/queries/schema-browser.html
+++ b/client/app/components/queries/schema-browser.html
@@ -9,7 +9,9 @@
 
     <button class="btn btn-default"
           title="Toggle Versioned Tables"
-          ng-click="$ctrl.flipToggleVersionedTables($ctrl.versionToggle)">
+          ng-click="$ctrl.flipToggleVersionedTables($ctrl.versionToggle, $ctrl.tabletogglestring)"
+          ng-if="$ctrl.tabletogglestring && $ctrl.tabletogglestring != ''"
+          >
     <span class="fa " ng-class="{'fa-toggle-on': $ctrl.versionToggle == true, 'fa-toggle-off': !$ctrl.versionToggle}">
       <input type="checkbox" id="versioned-tables-toggle" ng-model="$ctrl.versionToggle" hidden/>
     </span>
diff --git a/client/app/components/queries/schema-browser.js b/client/app/components/queries/schema-browser.js
index ca62768bf8..b6140ef9eb 100644
--- a/client/app/components/queries/schema-browser.js
+++ b/client/app/components/queries/schema-browser.js
@@ -21,10 +21,10 @@ function SchemaBrowserCtrl($scope) {
     return size;
   };
 
-  this.flipToggleVersionedTables = (versionToggle) => {
+  this.flipToggleVersionedTables = (versionToggle, toggleString) => {
     if (versionToggle === false) {
       this.versionToggle = true;
-      this.versionFilter = '_v';
+      this.versionFilter = toggleString;
     } else {
       this.versionToggle = false;
       this.versionFilter = 'abcdefghijklmnop';
@@ -35,6 +35,7 @@ function SchemaBrowserCtrl($scope) {
 const SchemaBrowser = {
   bindings: {
     schema: '<',
+    tabletogglestring: '<',
     onRefresh: '&',
     flipToggleVersionedTables: '&',
   },
diff --git a/client/app/pages/queries/query.html b/client/app/pages/queries/query.html
index 6f09ac2a22..30b44f22a5 100644
--- a/client/app/pages/queries/query.html
+++ b/client/app/pages/queries/query.html
@@ -85,6 +85,7 @@ <h3>
         <schema-browser class="col-md-3 hidden-sm hidden-xs schema-container"
                         schema="schema"
                         on-refresh="refreshSchema()"
+                        tabletogglestring="dataSource.options.toggle_table_string"1
                         ng-show="hasSchema">
         </schema-browser>
 
@@ -102,7 +103,8 @@ <h3>
               <i class="fa fa-database"></i> &nbsp;
               <select id="data-source-selection" ng-disabled="!isQueryOwner" ng-model="query.data_source_id" ng-change="updateDataSource()"
                       ng-options="ds.id as ds.name for ds in dataSources"></select>
-              <a ng-if="dataSource.options.doc_url != ''" ng-href={{dataSource.options.doc_url}}>{{dataSource.type_name}} documentation</a>
+              <a ng-if="dataSource.options.doc_url != '' && dataSource.options.doc_url" ng-href={{dataSource.options.doc_url}}>{{dataSource.type_name}} documentation</a>
+              <span ng-if="dataSource.options.doc_url == '' || !dataSource.options.doc_url">{{ dataSource.type_name }} documentation</span>
               <get-data-source-version id='data-source-version'></get-data-source-version>
 
               <div class="pull-right">
diff --git a/redash/models.py b/redash/models.py
index a841414281..87f22cbce4 100644
--- a/redash/models.py
+++ b/redash/models.py
@@ -528,10 +528,10 @@ def to_dict(self, all=False, with_permissions_for=None):
             'type_name': self.query_runner.name()
         }
 
+        schema = get_configuration_schema_for_query_runner_type(self.type)
+        self.options.set_schema(schema)
+        d['options'] = self.options.to_dict(mask_secrets=True)
         if all:
-            schema = get_configuration_schema_for_query_runner_type(self.type)
-            self.options.set_schema(schema)
-            d['options'] = self.options.to_dict(mask_secrets=True)
             d['queue_name'] = self.queue_name
             d['scheduled_queue_name'] = self.scheduled_queue_name
             d['groups'] = self.groups
@@ -541,13 +541,6 @@ def to_dict(self, all=False, with_permissions_for=None):
                 DataSourceGroup.group == with_permissions_for,
                 DataSourceGroup.data_source == self).one()[0]
 
-        doc_url = self.options.get('doc_url')
-        try:
-            if doc_url:
-                d['options'].update(doc_url=doc_url)
-        except:
-            d['options'] = {'doc_url': doc_url}
-
         return d
 
     def __unicode__(self):
diff --git a/redash/query_runner/activedata.py b/redash/query_runner/activedata.py
index df70692210..38dd1d8b5a 100644
--- a/redash/query_runner/activedata.py
+++ b/redash/query_runner/activedata.py
@@ -46,6 +46,12 @@ def configuration_schema(cls):
                     "type": "string",
                     "title": "Documentation URL",
                     "default": "https://github.com/klahnakoski/ActiveData/tree/dev/docs"
+                },
+                "toggle_table_string": {
+                    "type": "string",
+                    "title": "Toggle Table String",
+                    "default": "_v",
+                    "info": "This string will be used to toggle visibility of tables in the schema browser when editing a query in order to remove non-useful tables from sight."
                 }
             },
             "required": ["host_url"]
diff --git a/redash/query_runner/athena.py b/redash/query_runner/athena.py
index d2777e6991..df32b2cc92 100644
--- a/redash/query_runner/athena.py
+++ b/redash/query_runner/athena.py
@@ -79,6 +79,17 @@ def configuration_schema(cls):
                     'type': 'boolean',
                     'title': 'Use Glue Data Catalog',
                 },
+                "doc_url": {
+                    "type": "string",
+                    "title": "Documentation URL",
+                    "default": cls.default_doc_url
+                },
+                "toggle_table_string": {
+                    "type": "string",
+                    "title": "Toggle Table String",
+                    "default": "_v",
+                    "info": "This string will be used to toggle visibility of tables in the schema browser when editing a query in order to remove non-useful tables from sight."
+                }
             },
             'required': ['region', 's3_staging_dir'],
             'order': ['region', 'aws_access_key', 'aws_secret_key', 's3_staging_dir', 'schema'],
diff --git a/redash/query_runner/axibase_tsd.py b/redash/query_runner/axibase_tsd.py
index 9737b6bc87..9d50cd3b26 100644
--- a/redash/query_runner/axibase_tsd.py
+++ b/redash/query_runner/axibase_tsd.py
@@ -133,6 +133,12 @@ def configuration_schema(cls):
                 'trust_certificate': {
                     'type': 'boolean',
                     'title': 'Trust SSL Certificate'
+                },
+                "toggle_table_string": {
+                    "type": "string",
+                    "title": "Toggle Table String",
+                    "default": "_v",
+                    "info": "This string will be used to toggle visibility of tables in the schema browser when editing a query in order to remove non-useful tables from sight."
                 }
             },
             'required': ['username', 'password', 'hostname', 'protocol', 'port'],
diff --git a/redash/query_runner/big_query.py b/redash/query_runner/big_query.py
index 571a786bca..863f68d83e 100644
--- a/redash/query_runner/big_query.py
+++ b/redash/query_runner/big_query.py
@@ -123,6 +123,12 @@ def configuration_schema(cls):
                     "type": "string",
                     "title": "Documentation URL",
                     "default": cls.default_doc_url
+                },
+                "toggle_table_string": {
+                    "type": "string",
+                    "title": "Toggle Table String",
+                    "default": "_v",
+                    "info": "This string will be used to toggle visibility of tables in the schema browser when editing a query in order to remove non-useful tables from sight."
                 }
             },
             'required': ['jsonKeyFile', 'projectId'],
diff --git a/redash/query_runner/cass.py b/redash/query_runner/cass.py
index ac216ca3c2..f11ab91374 100644
--- a/redash/query_runner/cass.py
+++ b/redash/query_runner/cass.py
@@ -71,6 +71,12 @@ def configuration_schema(cls):
                     "type": "string",
                     "title": "Documentation URL",
                     "default": cls.default_doc_url
+                },
+                "toggle_table_string": {
+                    "type": "string",
+                    "title": "Toggle Table String",
+                    "default": "_v",
+                    "info": "This string will be used to toggle visibility of tables in the schema browser when editing a query in order to remove non-useful tables from sight."
                 }
             },
             'required': ['keyspace', 'host']
diff --git a/redash/query_runner/clickhouse.py b/redash/query_runner/clickhouse.py
index 7de1b396f8..72d37dd88c 100644
--- a/redash/query_runner/clickhouse.py
+++ b/redash/query_runner/clickhouse.py
@@ -29,6 +29,12 @@ def configuration_schema(cls):
                 "dbname": {
                     "type": "string",
                     "title": "Database Name"
+                },
+                "toggle_table_string": {
+                    "type": "string",
+                    "title": "Toggle Table String",
+                    "default": "_v",
+                    "info": "This string will be used to toggle visibility of tables in the schema browser when editing a query in order to remove non-useful tables from sight."
                 }
             },
             "required": ["dbname"],
diff --git a/redash/query_runner/dynamodb_sql.py b/redash/query_runner/dynamodb_sql.py
index b6cef14516..e5018fcb28 100644
--- a/redash/query_runner/dynamodb_sql.py
+++ b/redash/query_runner/dynamodb_sql.py
@@ -55,6 +55,12 @@ def configuration_schema(cls):
                     "type": "string",
                     "title": "Documentation URL",
                     "default": cls.default_doc_url
+                },
+                "toggle_table_string": {
+                    "type": "string",
+                    "title": "Toggle Table String",
+                    "default": "_v",
+                    "info": "This string will be used to toggle visibility of tables in the schema browser when editing a query in order to remove non-useful tables from sight."
                 }
             },
             "required": ["access_key", "secret_key"],
diff --git a/redash/query_runner/elasticsearch.py b/redash/query_runner/elasticsearch.py
index 835314e90b..f0238f3966 100644
--- a/redash/query_runner/elasticsearch.py
+++ b/redash/query_runner/elasticsearch.py
@@ -68,6 +68,12 @@ def configuration_schema(cls):
                     "type": "string",
                     "title": "Documentation URL",
                     "default": cls.default_doc_url
+                },
+                "toggle_table_string": {
+                    "type": "string",
+                    "title": "Toggle Table String",
+                    "default": "_v",
+                    "info": "This string will be used to toggle visibility of tables in the schema browser when editing a query in order to remove non-useful tables from sight."
                 }
             },
             "secret": ["basic_auth_password"],
diff --git a/redash/query_runner/google_analytics.py b/redash/query_runner/google_analytics.py
index 225903c427..7cb51a9b14 100644
--- a/redash/query_runner/google_analytics.py
+++ b/redash/query_runner/google_analytics.py
@@ -103,6 +103,12 @@ def configuration_schema(cls):
                 'jsonKeyFile': {
                     "type": "string",
                     'title': 'JSON Key File'
+                },
+                "toggle_table_string": {
+                    "type": "string",
+                    "title": "Toggle Table String",
+                    "default": "_v",
+                    "info": "This string will be used to toggle visibility of tables in the schema browser when editing a query in order to remove non-useful tables from sight."
                 }
             },
             'required': ['jsonKeyFile'],
diff --git a/redash/query_runner/google_spreadsheets.py b/redash/query_runner/google_spreadsheets.py
index 5caf179e01..297b2b29b9 100644
--- a/redash/query_runner/google_spreadsheets.py
+++ b/redash/query_runner/google_spreadsheets.py
@@ -168,6 +168,12 @@ def configuration_schema(cls):
                     "type": "string",
                     "title": "Documentation URL",
                     "default": cls.default_doc_url
+                },
+                "toggle_table_string": {
+                    "type": "string",
+                    "title": "Toggle Table String",
+                    "default": "_v",
+                    "info": "This string will be used to toggle visibility of tables in the schema browser when editing a query in order to remove non-useful tables from sight."
                 }
             },
             'required': ['jsonKeyFile'],
diff --git a/redash/query_runner/graphite.py b/redash/query_runner/graphite.py
index e2aaff6643..edb1c6449d 100644
--- a/redash/query_runner/graphite.py
+++ b/redash/query_runner/graphite.py
@@ -47,6 +47,12 @@ def configuration_schema(cls):
                     "type": "string",
                     "title": "Documentation URL",
                     "default": cls.default_doc_url
+                },
+                "toggle_table_string": {
+                    "type": "string",
+                    "title": "Toggle Table String",
+                    "default": "_v",
+                    "info": "This string will be used to toggle visibility of tables in the schema browser when editing a query in order to remove non-useful tables from sight."
                 }
             },
             'required': ['url'],
diff --git a/redash/query_runner/hive_ds.py b/redash/query_runner/hive_ds.py
index 5c0acb649b..b887732396 100644
--- a/redash/query_runner/hive_ds.py
+++ b/redash/query_runner/hive_ds.py
@@ -60,6 +60,12 @@ def configuration_schema(cls):
                     "type": "string",
                     "title": "Documentation URL",
                     "default": cls.default_doc_url
+                },
+                "toggle_table_string": {
+                    "type": "string",
+                    "title": "Toggle Table String",
+                    "default": "_v",
+                    "info": "This string will be used to toggle visibility of tables in the schema browser when editing a query in order to remove non-useful tables from sight."
                 }
             },
             "required": ["host"]
diff --git a/redash/query_runner/impala_ds.py b/redash/query_runner/impala_ds.py
index c1f817eb47..b75db07864 100644
--- a/redash/query_runner/impala_ds.py
+++ b/redash/query_runner/impala_ds.py
@@ -73,6 +73,12 @@ def configuration_schema(cls):
                     "type": "string",
                     "title": "Documentation URL",
                     "default": cls.default_doc_url
+                },
+                "toggle_table_string": {
+                    "type": "string",
+                    "title": "Toggle Table String",
+                    "default": "_v",
+                    "info": "This string will be used to toggle visibility of tables in the schema browser when editing a query in order to remove non-useful tables from sight."
                 }
             },
             "required": ["host"],
diff --git a/redash/query_runner/influx_db.py b/redash/query_runner/influx_db.py
index ea3d4932aa..85ceb9b911 100644
--- a/redash/query_runner/influx_db.py
+++ b/redash/query_runner/influx_db.py
@@ -65,6 +65,12 @@ def configuration_schema(cls):
                     "type": "string",
                     "title": "Documentation URL",
                     "default": cls.default_doc_url
+                },
+                "toggle_table_string": {
+                    "type": "string",
+                    "title": "Toggle Table String",
+                    "default": "_v",
+                    "info": "This string will be used to toggle visibility of tables in the schema browser when editing a query in order to remove non-useful tables from sight."
                 }
             },
             'required': ['url']
diff --git a/redash/query_runner/jql.py b/redash/query_runner/jql.py
index e3f9743547..61d8fc6598 100644
--- a/redash/query_runner/jql.py
+++ b/redash/query_runner/jql.py
@@ -161,6 +161,12 @@ def configuration_schema(cls):
                     "type": "string",
                     "title": "Documentation URL",
                     "default": cls.default_doc_url
+                },
+                "toggle_table_string": {
+                    "type": "string",
+                    "title": "Toggle Table String",
+                    "default": "_v",
+                    "info": "This string will be used to toggle visibility of tables in the schema browser when editing a query in order to remove non-useful tables from sight."
                 }
             },
             'required': ['url', 'username', 'password'],
diff --git a/redash/query_runner/memsql_ds.py b/redash/query_runner/memsql_ds.py
index bd3e106c2f..284874119d 100644
--- a/redash/query_runner/memsql_ds.py
+++ b/redash/query_runner/memsql_ds.py
@@ -56,6 +56,12 @@ def configuration_schema(cls):
                 },
                 "password": {
                     "type": "string"
+                },
+                "toggle_table_string": {
+                    "type": "string",
+                    "title": "Toggle Table String",
+                    "default": "_v",
+                    "info": "This string will be used to toggle visibility of tables in the schema browser when editing a query in order to remove non-useful tables from sight."
                 }
 
             },
diff --git a/redash/query_runner/mongodb.py b/redash/query_runner/mongodb.py
index d0f1e390c2..4c430b4bf5 100644
--- a/redash/query_runner/mongodb.py
+++ b/redash/query_runner/mongodb.py
@@ -99,6 +99,12 @@ def configuration_schema(cls):
                     "type": "string",
                     "title": "Documentation URL",
                     "default": cls.default_doc_url
+                },
+                "toggle_table_string": {
+                    "type": "string",
+                    "title": "Toggle Table String",
+                    "default": "_v",
+                    "info": "This string will be used to toggle visibility of tables in the schema browser when editing a query in order to remove non-useful tables from sight."
                 }
             },
             'required': ['connectionString', 'dbName']
diff --git a/redash/query_runner/mssql.py b/redash/query_runner/mssql.py
index 2d4be546f9..72ce3b74fd 100644
--- a/redash/query_runner/mssql.py
+++ b/redash/query_runner/mssql.py
@@ -74,6 +74,12 @@ def configuration_schema(cls):
                     "type": "string",
                     "title": "Documentation URL",
                     "default": cls.default_doc_url
+                },
+                "toggle_table_string": {
+                    "type": "string",
+                    "title": "Toggle Table String",
+                    "default": "_v",
+                    "info": "This string will be used to toggle visibility of tables in the schema browser when editing a query in order to remove non-useful tables from sight."
                 }
             },
             "required": ["db"],
diff --git a/redash/query_runner/mysql.py b/redash/query_runner/mysql.py
index efb6dce18e..359a743a69 100644
--- a/redash/query_runner/mysql.py
+++ b/redash/query_runner/mysql.py
@@ -58,6 +58,12 @@ def configuration_schema(cls):
                 'port': {
                     'type': 'number',
                     'default': 3306,
+                },
+                "toggle_table_string": {
+                    "type": "string",
+                    "title": "Toggle Table String",
+                    "default": "_v",
+                    "info": "This string will be used to toggle visibility of tables in the schema browser when editing a query in order to remove non-useful tables from sight."
                 }
             },
             "order": ['host', 'port', 'user', 'passwd', 'db'],
diff --git a/redash/query_runner/oracle.py b/redash/query_runner/oracle.py
index fd9b0a86fb..9f03dafc25 100644
--- a/redash/query_runner/oracle.py
+++ b/redash/query_runner/oracle.py
@@ -72,6 +72,12 @@ def configuration_schema(cls):
                     "type": "string",
                     "title": "Documentation URL",
                     "default": cls.default_doc_url
+                },
+                "toggle_table_string": {
+                    "type": "string",
+                    "title": "Toggle Table String",
+                    "default": "_v",
+                    "info": "This string will be used to toggle visibility of tables in the schema browser when editing a query in order to remove non-useful tables from sight."
                 }
             },
             "required": ["servicename", "user", "password", "host", "port"],
diff --git a/redash/query_runner/pg.py b/redash/query_runner/pg.py
index 0bb3b58859..b9473ef440 100644
--- a/redash/query_runner/pg.py
+++ b/redash/query_runner/pg.py
@@ -83,6 +83,12 @@ def configuration_schema(cls):
                     "type": "string",
                     "title": "Documentation URL",
                     "default": cls.default_doc_url
+                },
+                "toggle_table_string": {
+                    "type": "string",
+                    "title": "Toggle Table String",
+                    "default": "_v",
+                    "info": "This string will be used to toggle visibility of tables in the schema browser when editing a query in order to remove non-useful tables from sight."
                 }
             },
             "order": ['host', 'port', 'user', 'password'],
diff --git a/redash/query_runner/presto.py b/redash/query_runner/presto.py
index 0f2eebc130..cce94d61c3 100644
--- a/redash/query_runner/presto.py
+++ b/redash/query_runner/presto.py
@@ -61,6 +61,12 @@ def configuration_schema(cls):
                     "type": "string",
                     "title": "Documentation URL",
                     "default": cls.default_doc_url
+                },
+                "toggle_table_string": {
+                    "type": "string",
+                    "title": "Toggle Table String",
+                    "default": "_v",
+                    "info": "This string will be used to toggle visibility of tables in the schema browser when editing a query in order to remove non-useful tables from sight."
                 }
             },
             'required': ['host']
diff --git a/redash/query_runner/python.py b/redash/query_runner/python.py
index 3ae59497a7..3482d3c891 100644
--- a/redash/query_runner/python.py
+++ b/redash/query_runner/python.py
@@ -65,6 +65,12 @@ def configuration_schema(cls):
                     "type": "string",
                     "title": "Documentation URL",
                     "default": cls.default_doc_url
+                },
+                "toggle_table_string": {
+                    "type": "string",
+                    "title": "Toggle Table String",
+                    "default": "_v",
+                    "info": "This string will be used to toggle visibility of tables in the schema browser when editing a query in order to remove non-useful tables from sight."
                 }
             },
         }
diff --git a/redash/query_runner/salesforce.py b/redash/query_runner/salesforce.py
index fcda23c687..06f055425a 100644
--- a/redash/query_runner/salesforce.py
+++ b/redash/query_runner/salesforce.py
@@ -76,6 +76,12 @@ def configuration_schema(cls):
                 },
                 "sandbox": {
                     "type": "boolean"
+                },
+                "toggle_table_string": {
+                    "type": "string",
+                    "title": "Toggle Table String",
+                    "default": "_v",
+                    "info": "This string will be used to toggle visibility of tables in the schema browser when editing a query in order to remove non-useful tables from sight."
                 }
             },
             "required": ["username", "password", "token"],
diff --git a/redash/query_runner/script.py b/redash/query_runner/script.py
index ebbe70d8b8..fa142166e6 100644
--- a/redash/query_runner/script.py
+++ b/redash/query_runner/script.py
@@ -30,6 +30,12 @@ def configuration_schema(cls):
                     "type": "string",
                     "title": "Documentation URL",
                     "default": cls.default_doc_url
+                },
+                "toggle_table_string": {
+                    "type": "string",
+                    "title": "Toggle Table String",
+                    "default": "_v",
+                    "info": "This string will be used to toggle visibility of tables in the schema browser when editing a query in order to remove non-useful tables from sight."
                 }
             },
             'required': ['path']
diff --git a/redash/query_runner/snowflake.py b/redash/query_runner/snowflake.py
index a1a7ca447e..f223f54c9c 100644
--- a/redash/query_runner/snowflake.py
+++ b/redash/query_runner/snowflake.py
@@ -46,6 +46,12 @@ def configuration_schema(cls):
                 },
                 "database": {
                     "type": "string"
+                },
+                "toggle_table_string": {
+                    "type": "string",
+                    "title": "Toggle Table String",
+                    "default": "_v",
+                    "info": "This string will be used to toggle visibility of tables in the schema browser when editing a query in order to remove non-useful tables from sight."
                 }
             },
             "required": ["user", "password", "account", "database", "warehouse"],
diff --git a/redash/query_runner/sqlite.py b/redash/query_runner/sqlite.py
index 18bef51816..1819dd38bb 100644
--- a/redash/query_runner/sqlite.py
+++ b/redash/query_runner/sqlite.py
@@ -28,6 +28,12 @@ def configuration_schema(cls):
                     "type": "string",
                     "title": "Documentation URL",
                     "default": cls.default_doc_url
+                },
+                "toggle_table_string": {
+                    "type": "string",
+                    "title": "Toggle Table String",
+                    "default": "_v",
+                    "info": "This string will be used to toggle visibility of tables in the schema browser when editing a query in order to remove non-useful tables from sight."
                 }
             },
             "required": ["dbpath"],
diff --git a/redash/query_runner/treasuredata.py b/redash/query_runner/treasuredata.py
index 71f6a91705..ab10d815a4 100644
--- a/redash/query_runner/treasuredata.py
+++ b/redash/query_runner/treasuredata.py
@@ -64,6 +64,12 @@ def configuration_schema(cls):
                     "type": "string",
                     "title": "Documentation URL",
                     "default": cls.default_doc_url
+                },
+                "toggle_table_string": {
+                    "type": "string",
+                    "title": "Toggle Table String",
+                    "default": "_v",
+                    "info": "This string will be used to toggle visibility of tables in the schema browser when editing a query in order to remove non-useful tables from sight."
                 }
             },
             'required': ['apikey','db']
diff --git a/redash/query_runner/url.py b/redash/query_runner/url.py
index 5da7659390..c99289cca4 100644
--- a/redash/query_runner/url.py
+++ b/redash/query_runner/url.py
@@ -19,6 +19,12 @@ def configuration_schema(cls):
                     "type": "string",
                     "title": "Documentation URL",
                     "default": cls.default_doc_url
+                },
+                "toggle_table_string": {
+                    "type": "string",
+                    "title": "Toggle Table String",
+                    "default": "_v",
+                    "info": "This string will be used to toggle visibility of tables in the schema browser when editing a query in order to remove non-useful tables from sight."
                 }
             }
         }
diff --git a/redash/query_runner/vertica.py b/redash/query_runner/vertica.py
index 97b28ebfcb..ed45639879 100644
--- a/redash/query_runner/vertica.py
+++ b/redash/query_runner/vertica.py
@@ -65,6 +65,12 @@ def configuration_schema(cls):
                     "type": "string",
                     "title": "Documentation URL",
                     "default": cls.default_doc_url
+                },
+                "toggle_table_string": {
+                    "type": "string",
+                    "title": "Toggle Table String",
+                    "default": "_v",
+                    "info": "This string will be used to toggle visibility of tables in the schema browser when editing a query in order to remove non-useful tables from sight."
                 }
             },
             'required': ['database'],
diff --git a/tests/test_cli.py b/tests/test_cli.py
index 550ab577e7..61f65abc0e 100644
--- a/tests/test_cli.py
+++ b/tests/test_cli.py
@@ -16,7 +16,7 @@ def test_interactive_new(self):
         result = runner.invoke(
             manager,
             ['ds', 'new'],
-            input="test\n%s\n\n\n\nexample.com\n\n\ntestdb\n" % (pg_i,))
+            input="test\n%s\n\n\n\n\nexample.com\n\n\ntestdb\n" % (pg_i,))
         self.assertFalse(result.exception)
         self.assertEqual(result.exit_code, 0)
         self.assertEqual(DataSource.query.count(), 1)