diff --git a/client/app/components/dynamic-form.html b/client/app/components/dynamic-form.html
index 066a6a2ecc..519882de1e 100644
--- a/client/app/components/dynamic-form.html
+++ b/client/app/components/dynamic-form.html
@@ -11,6 +11,7 @@
         <label ng-if="field.property.type !== 'checkbox'">{{field.property.title || field.name | capitalize}}</label>
         <input name="input" type="{{field.property.type}}" class="form-control" ng-model="target.options[field.name]" ng-required="field.property.required"
                ng-if="field.property.type !== 'file' && field.property.type !== 'checkbox'" accesskey="tab" placeholder="{{field.property.default}}">
+               <div class="mute-text"> {{ field.property.info }} </div>
 
         <label ng-if="field.property.type=='checkbox'">
             <input name="input" type="{{field.property.type}}" ng-model="target.options[field.name]" ng-required="field.property.required"
diff --git a/redash/models.py b/redash/models.py
index e1354a72fc..8239c5df91 100644
--- a/redash/models.py
+++ b/redash/models.py
@@ -525,11 +525,11 @@ def to_dict(self, all=False, with_permissions_for=None):
             'syntax': self.query_runner.syntax,
             'paused': self.paused,
             'pause_reason': self.pause_reason,
-            'type_name': self.query_runner.name(),
+            'type_name': self.query_runner.name()
         }
 
-        schema = get_configuration_schema_for_query_runner_type(self.type)
         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
@@ -541,9 +541,11 @@ 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', schema['properties'].get(
-            'doc_url', {}).get('default'))
-        if doc_url:
+        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
@@ -620,8 +622,6 @@ def add_group(self, group, view_only=False):
         db.session.add(dsg)
         return dsg
 
-        setattr(self, 'data_source_groups', dsg)
-
     def remove_group(self, group):
         db.session.query(DataSourceGroup).filter(
             DataSourceGroup.group == group,
diff --git a/redash/query_runner/activedata.py b/redash/query_runner/activedata.py
new file mode 100644
index 0000000000..90f90effa4
--- /dev/null
+++ b/redash/query_runner/activedata.py
@@ -0,0 +1,177 @@
+import json
+import logging
+
+import requests
+
+from redash.query_runner import TYPE_INTEGER, TYPE_STRING, TYPE_FLOAT, BaseSQLQueryRunner, register
+from redash.utils import JSONEncoder
+
+#Originally written by Github user @klahnakoski
+#Original link: https://github.com/klahnakoski/ActiveData-redash-query-runner/blob/c0e7286c09c6f1eb6746a6c7cca581bea79f4757/active_data.py
+
+logger = logging.getLogger(__name__)
+
+types_map = {
+    bool: TYPE_INTEGER,
+    str: TYPE_STRING,
+    unicode: TYPE_STRING,
+    dict: TYPE_STRING,
+    list: TYPE_STRING,
+    int: TYPE_INTEGER,
+    long: TYPE_INTEGER,
+    float: TYPE_FLOAT,
+    "string": TYPE_STRING,
+    "object": TYPE_STRING,
+    "long": TYPE_STRING,
+    "double": TYPE_FLOAT,
+    "integer": TYPE_FLOAT
+}
+
+
+class ActiveData(BaseSQLQueryRunner):
+    noop_query = "SELECT 1"
+
+    @classmethod
+    def configuration_schema(cls):
+        return {
+            "type": "object",
+            "properties": {
+                "host_url": {
+                    "type": "string",
+                    "title": "Host URL",
+                    "default": "https://activedata.allizom.org:80",
+                    "info": "Please include a port. Do not end with a trailing slash."
+                },
+                "doc_url": {
+                    "type": "string",
+                    "title": "Documentation URL",
+                    "default": "https://github.com/klahnakoski/ActiveData/tree/dev/docs"
+                }
+            },
+            "required": ["host_url"]
+        }
+
+    @classmethod
+    def name(cls):
+        return "ActiveData"
+
+    @classmethod
+    def type(cls):
+        return "activedata"
+
+    @classmethod
+    def enabled(cls):
+        return True
+
+    def _get_tables(self, schema):
+        query = {
+            "from": "meta.columns",
+            "select": [
+                "name",
+                "type",
+                "table"
+            ],
+            "where": {"not": {"prefix": {"es_index": "meta."}}},
+            "limit": 1000,
+            "format": "list"
+        }
+        results = self.run_jx_query(query, None)
+
+        for row in results['data']:
+            table_name = row['table']
+
+            if table_name not in schema:
+                schema[table_name] = {'name': table_name, 'columns': []}
+
+            schema[table_name]['columns'].append(row['name'] + ' (' + types_map.get(row['type'], TYPE_STRING) + ')')
+
+        return [{'name': r['name'], 'columns': sorted(r['columns'])} for r in schema.values()]
+
+    def run_jx_query(self, query, user):
+        data = json.dumps(query, ensure_ascii=False)
+        result = requests.post(self.configuration['host_url']+"/query", data=data)
+        response = json.loads(result.content)
+
+        if response.get('type') == "ERROR":
+            cause = find_cause(response)
+            raise Exception(cause)
+        return response
+
+    def run_query(self, annotated_query, user):
+        request = {}
+        comment, request["sql"] = annotated_query.split("*/", 2)
+        meta = request['meta'] = {}
+        for kv in comment.strip()[2:].split(","):
+            k, v = [s.strip() for s in kv.split(':')]
+            meta[k] = v
+
+        logger.debug("Send ActiveData a SQL query: %s", request['sql'])
+        data = json.dumps(request, ensure_ascii=False)
+        result = requests.post(self.configuration['host_url']+"/sql", data=data)
+        response = json.loads(result.content)
+
+        if response.get('type') == "ERROR":
+            cause = find_cause(response)
+            return None, cause
+
+        output = normalize(response)
+        json_data = json.dumps(output, cls=JSONEncoder)
+        return json_data, None
+
+
+
+def normalize(table):
+    columns = {}  # MAP FROM name TO (MAP FROM type TO (full_name))
+    output = []
+
+    def get_unique_name(name, type):
+        all_types = columns.get(name)
+        if all_types is None:
+            all_types = columns[name] = {}
+        specific_type = all_types.get(type)
+        if specific_type is None:
+            if all_types:
+                specific_type = all_types[type] = name + "." + type
+            else:
+                specific_type = all_types[type] = name
+        return specific_type
+
+    for r in table['data']:
+        new_row = {}
+        for i, cname in enumerate(table['header']):
+            val = r[i]
+            if val is None:
+                continue
+            type_ = val.__class__
+            if isinstance(val, (dict, list)):
+                val = json.dumps(val, cls=JSONEncoder)
+            col = get_unique_name(cname, types_map.get(type(val), TYPE_STRING))
+            new_row[col] = val
+        output.append(new_row)
+
+    output_columns = [
+        {
+            "name": full_name,
+            "type": ctype,
+            "friendly_name": full_name
+        }
+        for cname, types in columns.items()
+        for ctype, full_name in types.items()
+    ]
+
+    return {
+        'columns': output_columns,
+        'rows': output
+    }
+
+
+def find_cause(e):
+    while e.get('cause') is not None:
+        c = e['cause']
+        if isinstance(c, list):
+            e = c[0]
+        else:
+            e = c
+    return e.get('template')
+
+register(ActiveData)
diff --git a/redash/settings.py b/redash/settings.py
index 650d8e451f..74423a9fd6 100644
--- a/redash/settings.py
+++ b/redash/settings.py
@@ -226,7 +226,8 @@ def all_settings():
     'redash.query_runner.axibase_tsd',
     'redash.query_runner.salesforce',
     'redash.query_runner.query_results',
-    'redash.query_runner.qubole'
+    'redash.query_runner.qubole',
+    'redash.query_runner.activedata',
 ]
 
 enabled_query_runners = array_from_string(os.environ.get("REDASH_ENABLED_QUERY_RUNNERS", ",".join(default_query_runners)))