diff --git a/resources/assets/scripts/app/controllers/playlists-list.coffee b/resources/assets/scripts/app/controllers/playlists-list.coffee
index 9aca00fa..44076453 100644
--- a/resources/assets/scripts/app/controllers/playlists-list.coffee
+++ b/resources/assets/scripts/app/controllers/playlists-list.coffee
@@ -17,7 +17,12 @@
 window.pfm.preloaders['playlists-list'] = [
     'playlists', '$state'
     (playlists, $state) ->
-        playlists.fetchList($state.params.page, true)
+        playlists.loadFilters().then(->
+            playlists.mainQuery.fromFilterString($state.params.filter)
+            playlists.mainQuery.setPage $state.params.page || 1
+
+            playlists.mainQuery.fetch()
+        )
 ]
 
 module.exports = angular.module('ponyfm').controller "playlists-list", [
diff --git a/resources/assets/scripts/app/controllers/playlists.coffee b/resources/assets/scripts/app/controllers/playlists.coffee
index 64e405a5..bba00a2f 100644
--- a/resources/assets/scripts/app/controllers/playlists.coffee
+++ b/resources/assets/scripts/app/controllers/playlists.coffee
@@ -23,8 +23,6 @@ window.pfm.preloaders['playlists'] = [
 module.exports = angular.module('ponyfm').controller "playlists", [
     '$scope', 'playlists', '$state'
     ($scope, playlists, $state) ->
-        # ToDo: Move this function back to preloaders, as soon as I figured out how they work
-        playlists.loadFilters()
 
         $scope.query = playlists.mainQuery
         $scope.filters = playlists.filters