diff --git a/frontend/src/AddMovie/ImportMovie/Import/ImportMovieRow.js b/frontend/src/AddMovie/ImportMovie/Import/ImportMovieRow.js
index 7858b6633d..a419eb40e1 100644
--- a/frontend/src/AddMovie/ImportMovie/Import/ImportMovieRow.js
+++ b/frontend/src/AddMovie/ImportMovie/Import/ImportMovieRow.js
@@ -81,7 +81,6 @@ ImportMovieRow.propTypes = {
   selectedMovie: PropTypes.object,
   isExistingMovie: PropTypes.bool.isRequired,
   items: PropTypes.arrayOf(PropTypes.object).isRequired,
-  queued: PropTypes.bool.isRequired,
   isSelected: PropTypes.bool,
   onSelectedChange: PropTypes.func.isRequired,
   onInputChange: PropTypes.func.isRequired
diff --git a/frontend/src/AddMovie/ImportMovie/Import/SelectMovie/ImportMovieSelectMovie.js b/frontend/src/AddMovie/ImportMovie/Import/SelectMovie/ImportMovieSelectMovie.js
index 6ec718b034..eca2eda874 100644
--- a/frontend/src/AddMovie/ImportMovie/Import/SelectMovie/ImportMovieSelectMovie.js
+++ b/frontend/src/AddMovie/ImportMovie/Import/SelectMovie/ImportMovieSelectMovie.js
@@ -131,7 +131,7 @@ class ImportMovieSelectMovie extends Component {
               id={this._buttonId}
             >
               <Link
-                ref={ref}
+                // ref={ref}
                 className={styles.button}
                 component="div"
                 onPress={this.onPress}
@@ -255,7 +255,7 @@ class ImportMovieSelectMovie extends Component {
                             items.map((item) => {
                               return (
                                 <ImportMovieSearchResultConnector
-                                  key={item.tvdbId}
+                                  key={item.tmdbId}
                                   tmdbId={item.tmdbId}
                                   title={item.title}
                                   year={item.year}
diff --git a/frontend/src/Store/Actions/importMovieActions.js b/frontend/src/Store/Actions/importMovieActions.js
index 4e13cd6d0b..ae0135c175 100644
--- a/frontend/src/Store/Actions/importMovieActions.js
+++ b/frontend/src/Store/Actions/importMovieActions.js
@@ -86,7 +86,7 @@ export const actionHandlers = handleThunks({
       section,
       ...item,
       term,
-      queued: true,
+      isQueued: true,
       items: []
     }));
 
@@ -151,6 +151,8 @@ export const actionHandlers = handleThunks({
     abortCurrentLookup = abortRequest;
 
     request.done((data) => {
+      const selectedMovie = queued.selectedMovie || data[0];
+
       dispatch(updateItem({
         section,
         id: queued.id,
@@ -158,8 +160,8 @@ export const actionHandlers = handleThunks({
         isPopulated: true,
         error: null,
         items: data,
-        queued: false,
-        selectedMovie: queued.selectedMovie || data[0],
+        isQueued: false,
+        selectedMovie,
         updateOnly: true
       }));
     });
@@ -171,7 +173,7 @@ export const actionHandlers = handleThunks({
         isFetching: false,
         isPopulated: false,
         error: xhr,
-        queued: false,
+        isQueued: false,
         updateOnly: true
       }));
     });
@@ -278,7 +280,23 @@ export const actionHandlers = handleThunks({
 export const reducers = createHandleActions({
 
   [CANCEL_LOOKUP_MOVIE]: function(state) {
-    return Object.assign({}, state, { isLookingUpMovie: false });
+    queue.splice(0, queue.length);
+
+    const items = state.items.map((item) => {
+      if (item.isQueued) {
+        return {
+          ...item,
+          isQueued: false
+        };
+      }
+
+      return item;
+    });
+
+    return Object.assign({}, state, {
+      isLookingUpMovie: false,
+      items
+    });
   },
 
   [CLEAR_IMPORT_MOVIE]: function(state) {
diff --git a/frontend/src/index.ts b/frontend/src/index.ts
index b9cb9ad848..3ea4ad28ca 100644
--- a/frontend/src/index.ts
+++ b/frontend/src/index.ts
@@ -23,12 +23,13 @@ const error = console.error;
 function logError(...parameters: any[]) {
   const filter = parameters.find((parameter) => {
     return (
-      parameter.includes(
+      typeof parameter === 'string' &&
+      (parameter.includes(
         'Support for defaultProps will be removed from function components in a future major release'
       ) ||
-      parameter.includes(
-        'findDOMNode is deprecated and will be removed in the next major release'
-      )
+        parameter.includes(
+          'findDOMNode is deprecated and will be removed in the next major release'
+        ))
     );
   });
 
diff --git a/src/NzbDrone.Core/Localization/Core/en.json b/src/NzbDrone.Core/Localization/Core/en.json
index d41c025b02..70cb30ee38 100644
--- a/src/NzbDrone.Core/Localization/Core/en.json
+++ b/src/NzbDrone.Core/Localization/Core/en.json
@@ -975,6 +975,7 @@
   "MissingMonitoredAndConsideredAvailable": "Missing (Monitored)",
   "MissingNoItems": "No missing items",
   "MissingNotMonitored": "Missing (Unmonitored)",
+  "Mixed": "Mixed",
   "Mode": "Mode",
   "Monday": "Monday",
   "Monitor": "Monitor",