diff --git a/frontend/src/Activity/Queue/Queue.js b/frontend/src/Activity/Queue/Queue.js
index ad26af35f..0fa1505cd 100644
--- a/frontend/src/Activity/Queue/Queue.js
+++ b/frontend/src/Activity/Queue/Queue.js
@@ -3,6 +3,7 @@ import PropTypes from 'prop-types';
 import React, { Component } from 'react';
 import hasDifferentItems from 'Utilities/Object/hasDifferentItems';
 import getSelectedIds from 'Utilities/Table/getSelectedIds';
+import removeOldSelectedState from 'Utilities/Table/removeOldSelectedState';
 import selectAll from 'Utilities/Table/selectAll';
 import toggleSelected from 'Utilities/Table/toggleSelected';
 import { align, icons } from 'Helpers/Props';
@@ -61,7 +62,10 @@ class Queue extends Component {
 
   componentDidUpdate(prevProps) {
     if (hasDifferentItems(prevProps.items, this.props.items)) {
-      this.setState({ selectedState: {} });
+      this.setState((state) => {
+        return removeOldSelectedState(state, prevProps.items);
+      });
+
       return;
     }
 
diff --git a/frontend/src/Components/Table/TableHeaderCell.js b/frontend/src/Components/Table/TableHeaderCell.js
index 73c4b7ec2..e4739e63f 100644
--- a/frontend/src/Components/Table/TableHeaderCell.js
+++ b/frontend/src/Components/Table/TableHeaderCell.js
@@ -30,6 +30,7 @@ class TableHeaderCell extends Component {
     const {
       className,
       name,
+      columnLabel,
       isSortable,
       isVisible,
       isModifiable,
@@ -49,10 +50,11 @@ class TableHeaderCell extends Component {
     return (
       isSortable ?
         <Link
+          {...otherProps}
           component="th"
           className={className}
+          title={columnLabel}
           onPress={this.onPress}
-          {...otherProps}
         >
           {children}
 
@@ -75,7 +77,7 @@ class TableHeaderCell extends Component {
 TableHeaderCell.propTypes = {
   className: PropTypes.string,
   name: PropTypes.string.isRequired,
-  label: PropTypes.oneOfType([PropTypes.string, PropTypes.object]),
+  columnLabel: PropTypes.string,
   isSortable: PropTypes.bool,
   isVisible: PropTypes.bool,
   isModifiable: PropTypes.bool,