diff --git a/client/app/pages/queries-list/QueriesList.jsx b/client/app/pages/queries-list/QueriesList.jsx
index cc81cc589c..84049179ed 100644
--- a/client/app/pages/queries-list/QueriesList.jsx
+++ b/client/app/pages/queries-list/QueriesList.jsx
@@ -40,7 +40,7 @@ class QueriesList extends React.Component {
     {
       key: 'archive',
       href: 'queries/archive',
-      title: 'Archive',
+      title: 'Archived',
       icon: () => <Sidebar.MenuIcon icon="fa fa-archive" />,
     },
     {
@@ -56,7 +56,7 @@ class QueriesList extends React.Component {
     Columns.favorites({ className: 'p-r-0' }),
     Columns.custom.sortable((text, item) => (
       <React.Fragment>
-        <a className="table-main-title" href={'dashboard/' + item.slug}>{ item.name }</a>
+        <a className="table-main-title" href={'queries/' + item.id}>{ item.name }</a>
         <QueryTagsControl
           className="d-block"
           tags={item.tags}
diff --git a/client/app/pages/queries-list/QueriesListEmptyState.jsx b/client/app/pages/queries-list/QueriesListEmptyState.jsx
index e36cc02b5a..e499de7c9b 100644
--- a/client/app/pages/queries-list/QueriesListEmptyState.jsx
+++ b/client/app/pages/queries-list/QueriesListEmptyState.jsx
@@ -24,8 +24,8 @@ export default function QueriesListEmptyState({ page, searchTerm, selectedTags }
     );
     case 'my': return (
       <div className="tiled bg-white p-15">
-        <a href="queries/new" className="btn btn-primary btn-sm">Create your first query</a> to populate My Queries
-        list. Need help? Check out our
+        <a href="queries/new" className="btn btn-primary btn-sm">Create your first query</a>
+        {' '}to populate My Queries list. Need help? Check out our{' '}
         <a href="https://redash.io/help/user-guide/querying/writing-queries">query writing documentation</a>.
       </div>
     );