diff --git a/src/NzbDrone.Core/Tv/MovieService.cs b/src/NzbDrone.Core/Tv/MovieService.cs
index cae86a968..e2585327e 100644
--- a/src/NzbDrone.Core/Tv/MovieService.cs
+++ b/src/NzbDrone.Core/Tv/MovieService.cs
@@ -75,15 +75,15 @@ namespace NzbDrone.Core.Tv
             //{
             //    return v => v.Monitored == true || v.Monitored == false;
             //}
-            if (FilterKey == "moviemonitored" && FilterValue == "false")
+            if (FilterKey == "monitored" && FilterValue == "false")
             {
                 return v => v.Monitored == false;
             }
-            else if (FilterKey == "moviemonitored" && FilterValue == "true")
+            else if (FilterKey == "monitored" && FilterValue == "true")
             {
                 return v => v.Monitored == true;
             }
-            else if (FilterKey == "moviestatus")
+            else if (FilterKey == "status")
             {
                 switch (FilterValue)
                 {
@@ -105,7 +105,7 @@ namespace NzbDrone.Core.Tv
                         break;
                 }
             }
-            else if (FilterKey == "moviedownloaded")
+            else if (FilterKey == "downloaded")
             {
                 return v => v.MovieFileId == 0;
             }
diff --git a/src/UI/Movies/MoviesCollection.js b/src/UI/Movies/MoviesCollection.js
index 36a99e3e0..a4ec0fa87 100644
--- a/src/UI/Movies/MoviesCollection.js
+++ b/src/UI/Movies/MoviesCollection.js
@@ -19,33 +19,33 @@ var filterModes = {
         null
     ],
     'continuing' : [
-        'moviestatus',
+        'status',
         'continuing'
     ],
     'ended'      : [
-        'moviestatus',
+        'status',
         'ended'
     ],
     'monitored'  : [
-        'moviemonitored',
+        'monitored',
         true
     ],
     'missing'  : [
-        'moviedownloaded',
+        'downloaded',
         false
     ],
     'released'  : [
-        "moviestatus",
+        "status",
         "released",
         //function(model) { return model.getStatus() == "released"; }
     ],
     'announced'  : [
-        "moviestatus",
+        "status",
         "announced",
         //function(model) { return model.getStatus() == "announced"; }
     ],
     'cinemas'  : [
-        "moviestatus",
+        "status",
         "inCinemas",
         //function(model) { return model.getStatus() == "inCinemas"; }
     ]
diff --git a/src/UI/Wanted/Cutoff/CutoffUnmetCollection.js b/src/UI/Wanted/Cutoff/CutoffUnmetCollection.js
index 107573d81..e93f08e59 100644
--- a/src/UI/Wanted/Cutoff/CutoffUnmetCollection.js
+++ b/src/UI/Wanted/Cutoff/CutoffUnmetCollection.js
@@ -31,27 +31,27 @@ var Collection = PagableCollection.extend({
 
     filterModes : {
         'monitored'   : [
-            'moviemonitored',
+            'monitored',
             'true'
         ],
         'unmonitored' : [
-            'moviemonitored',
+            'monitored',
             'false'
         ],
         'announced' : [
-            'moviestatus',
+            'status',
             'announced'
         ],
         'incinemas' : [
-            'moviestatus',
+            'status',
             'inCinemas'
         ],
         'released' : [
-            'moviestatus',
+            'status',
             'released'
         ],
         'available' : [
-            'moviestatus',
+            'status',
             'available'
         ],
         'all' : [
diff --git a/src/UI/Wanted/Missing/MissingCollection.js b/src/UI/Wanted/Missing/MissingCollection.js
index 2dc2449e0..242eb779c 100644
--- a/src/UI/Wanted/Missing/MissingCollection.js
+++ b/src/UI/Wanted/Missing/MissingCollection.js
@@ -30,27 +30,27 @@ var Collection = PagableCollection.extend({
 
     filterModes : {
         'monitored'   : [
-            'moviemonitored',
+            'monitored',
             'true'
         ],
         'unmonitored' : [
-            'moviemonitored',
+            'monitored',
             'false'
         ],
     	'announced' : [
-    		'moviestatus',
+    		'status',
     		'announced'
     	],
     	'incinemas' : [
-    		'moviestatus',
+    		'status',
     		'inCinemas'
     	],
     	'released' : [
-    		'moviestatus',
+    		'status',
     		'released'
     	],
     	'available' : [
-    		'moviestatus',
+    		'status',
     		'available'
     	],
     	'all' : [