diff --git a/caravel/assets/javascripts/SqlLab/components/QuerySearch.jsx b/caravel/assets/javascripts/SqlLab/components/QuerySearch.jsx
index 3e5bb91d6bfc..912366b90810 100644
--- a/caravel/assets/javascripts/SqlLab/components/QuerySearch.jsx
+++ b/caravel/assets/javascripts/SqlLab/components/QuerySearch.jsx
@@ -126,7 +126,7 @@ class QuerySearch extends React.Component {
         </div>
         <QueryTable
           columns={[
-            'state', 'dbId', 'userId',
+            'state', 'db', 'user',
             'progress', 'rows', 'sql', 'querylink',
           ]}
           onUserClicked={this.onUserClicked.bind(this)}
diff --git a/caravel/assets/javascripts/SqlLab/components/QueryTable.jsx b/caravel/assets/javascripts/SqlLab/components/QueryTable.jsx
index 644c330f3d7e..77ac6715fee7 100644
--- a/caravel/assets/javascripts/SqlLab/components/QueryTable.jsx
+++ b/caravel/assets/javascripts/SqlLab/components/QueryTable.jsx
@@ -28,7 +28,8 @@ class QueryTable extends React.Component {
   }
   getQueryLink(dbId, sql) {
     const params = ['dbid=' + dbId, 'sql=' + sql, 'title=Untitled Query'];
-    return getLink(this.state.cleanUri, params);
+    const link = getLink(this.state.cleanUri, params);
+    return encodeURI(link);
   }
   hideVisualizeModal() {
     this.setState({ showVisualizeModal: false });
@@ -50,20 +51,20 @@ class QueryTable extends React.Component {
       if (q.endDttm) {
         q.duration = fDuration(q.startDttm, q.endDttm);
       }
-      q.userId = (
+      q.user = (
         <button
           className="btn btn-link btn-xs"
           onClick={this.props.onUserClicked.bind(this, q.userId)}
         >
-          {q.userId}
+          {q.user}
         </button>
       );
-      q.dbId = (
+      q.db = (
         <button
           className="btn btn-link btn-xs"
           onClick={this.props.onDbClicked.bind(this, q.dbId)}
         >
-          {q.dbId}
+          {q.db}
         </button>
       );
       q.started = moment(q.startDttm).format('HH:mm:ss');
diff --git a/caravel/models.py b/caravel/models.py
index f4cc6b778dea..702b2dc40707 100644
--- a/caravel/models.py
+++ b/caravel/models.py
@@ -2006,6 +2006,7 @@ class Query(Model):
 
     database = relationship(
         'Database', foreign_keys=[database_id], backref='queries')
+    user = relationship('User', backref='queries', foreign_keys=[user_id])
 
     __table_args__ = (
         sqla.Index('ti_user_id_changed_on', user_id, changed_on),
@@ -2020,6 +2021,7 @@ def to_dict(self):
             'changedOn': self.changed_on,
             'changed_on': self.changed_on.isoformat(),
             'dbId': self.database_id,
+            'db': self.database.database_name,
             'endDttm': self.end_time,
             'errorMessage': self.error_message,
             'executedSql': self.executed_sql,
@@ -2037,6 +2039,7 @@ def to_dict(self):
             'tab': self.tab_name,
             'tempTable': self.tmp_table_name,
             'userId': self.user_id,
+            'user': self.user.username,
             'limit_reached': self.limit_reached,
         }