--- a/server/src/app/Http/Controllers/Api/DocumentController.php	Thu Oct 20 17:27:36 2016 +0200
+++ b/server/src/app/Http/Controllers/Api/DocumentController.php	Thu Oct 20 19:14:37 2016 +0200
@@ -3,7 +3,6 @@
 namespace CorpusParole\Http\Controllers\Api;
 
 use Illuminate\Http\Request;
-//use Illuminate\Http\Response;
 
 use CorpusParole\Http\Requests;
 use CorpusParole\Http\Controllers\Controller;
@@ -30,31 +29,9 @@
     {
         $perPage = intval($request->input('perpage', config('corpusparole.documents_per_page')));
 
-        $filters = [];
-
-        $languages = CorpusFilterManager::prepareLanguages($request->input('language', []));
-        if(!empty($languages)) {
-            $filters['language'] = $languages;
-        }
-
-        $location = CorpusFilterManager::prepareLocation($request->input('location', ''));
-        if(!empty($location)) {
-            $filters['location'] = $location;
-        }
+        $filterManager = new CorpusFilterManager();
 
-        $themes = CorpusFilterManager::prepareTheme($request->input('theme', []));
-        if(!empty($themes)) {
-            $filters['themes'] = $themes;
-        }
-
-        $discourses = CorpusFilterManager::prepareDiscourse($request->input('discourse', []));
-        if(!empty($discourses)) {
-            $filters['discourses'] = $discourses;
-        }
-        $dates = CorpusFilterManager::prepareDate($request->input('date', []));
-        if(!empty($dates)) {
-            $filters['dates'] = $dates;
-        }
+        $filters = $filterManager->prepareFilters($request);
 
         $sort = $request->input('sort', null);