diff --git a/lib/composer/autoload_classmap.php b/lib/composer/autoload_classmap.php
index 4cfba76c2..ce8fe65e9 100644
--- a/lib/composer/autoload_classmap.php
+++ b/lib/composer/autoload_classmap.php
@@ -190,13 +190,13 @@ return array(
     'Combodo\\iTop\\Application\\Branding' => $baseDir . '/sources/Application/Branding.php',
     'Combodo\\iTop\\Application\\Helper\\Session' => $baseDir . '/sources/Application/Helper/Session.php',
     'Combodo\\iTop\\Application\\Helper\\WebResourcesHelper' => $baseDir . '/sources/Application/Helper/WebResourcesHelper.php',
-    'Combodo\\iTop\\Application\\Search\\AjaxSearchException' => $baseDir . '/sources/Application/Search/ajaxsearchexception.class.inc.php',
-    'Combodo\\iTop\\Application\\Search\\CriterionConversionAbstract' => $baseDir . '/sources/Application/Search/criterionconversionabstract.class.inc.php',
-    'Combodo\\iTop\\Application\\Search\\CriterionConversion\\CriterionToOQL' => $baseDir . '/sources/Application/Search/CriterionConversion/criteriontooql.class.inc.php',
-    'Combodo\\iTop\\Application\\Search\\CriterionConversion\\CriterionToSearchForm' => $baseDir . '/sources/Application/Search/CriterionConversion/criteriontosearchform.class.inc.php',
-    'Combodo\\iTop\\Application\\Search\\CriterionParser' => $baseDir . '/sources/Application/Search/criterionparser.class.inc.php',
-    'Combodo\\iTop\\Application\\Search\\SearchForm' => $baseDir . '/sources/Application/Search/searchform.class.inc.php',
-    'Combodo\\iTop\\Application\\Status\\Status' => $baseDir . '/sources/Application/Status/Status.php',
+    'Combodo\\iTop\\Application\\Search\\AjaxSearchException' => $baseDir . '/sources/Application/search/ajaxsearchexception.class.inc.php',
+    'Combodo\\iTop\\Application\\Search\\CriterionConversionAbstract' => $baseDir . '/sources/Application/search/criterionconversionabstract.class.inc.php',
+    'Combodo\\iTop\\Application\\Search\\CriterionConversion\\CriterionToOQL' => $baseDir . '/sources/Application/search/criterionconversion/criteriontooql.class.inc.php',
+    'Combodo\\iTop\\Application\\Search\\CriterionConversion\\CriterionToSearchForm' => $baseDir . '/sources/Application/search/criterionconversion/criteriontosearchform.class.inc.php',
+    'Combodo\\iTop\\Application\\Search\\CriterionParser' => $baseDir . '/sources/Application/search/criterionparser.class.inc.php',
+    'Combodo\\iTop\\Application\\Search\\SearchForm' => $baseDir . '/sources/Application/search/searchform.class.inc.php',
+    'Combodo\\iTop\\Application\\Status\\Status' => $baseDir . '/sources/Application/status/Status.php',
     'Combodo\\iTop\\Application\\TwigBase\\Controller\\Controller' => $baseDir . '/sources/Application/TwigBase/Controller/Controller.php',
     'Combodo\\iTop\\Application\\TwigBase\\Controller\\PageNotFoundException' => $baseDir . '/application/exceptions/PageNotFoundException.php',
     'Combodo\\iTop\\Application\\TwigBase\\Twig\\Extension' => $baseDir . '/sources/Application/TwigBase/Twig/Extension.php',
diff --git a/lib/composer/autoload_static.php b/lib/composer/autoload_static.php
index 1873d23bb..b15065cba 100644
--- a/lib/composer/autoload_static.php
+++ b/lib/composer/autoload_static.php
@@ -555,13 +555,13 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
         'Combodo\\iTop\\Application\\Branding' => __DIR__ . '/../..' . '/sources/Application/Branding.php',
         'Combodo\\iTop\\Application\\Helper\\Session' => __DIR__ . '/../..' . '/sources/Application/Helper/Session.php',
         'Combodo\\iTop\\Application\\Helper\\WebResourcesHelper' => __DIR__ . '/../..' . '/sources/Application/Helper/WebResourcesHelper.php',
-        'Combodo\\iTop\\Application\\Search\\AjaxSearchException' => __DIR__ . '/../..' . '/sources/Application/Search/ajaxsearchexception.class.inc.php',
-        'Combodo\\iTop\\Application\\Search\\CriterionConversionAbstract' => __DIR__ . '/../..' . '/sources/Application/Search/criterionconversionabstract.class.inc.php',
-        'Combodo\\iTop\\Application\\Search\\CriterionConversion\\CriterionToOQL' => __DIR__ . '/../..' . '/sources/Application/Search/CriterionConversion/criteriontooql.class.inc.php',
-        'Combodo\\iTop\\Application\\Search\\CriterionConversion\\CriterionToSearchForm' => __DIR__ . '/../..' . '/sources/Application/Search/CriterionConversion/criteriontosearchform.class.inc.php',
-        'Combodo\\iTop\\Application\\Search\\CriterionParser' => __DIR__ . '/../..' . '/sources/Application/Search/criterionparser.class.inc.php',
-        'Combodo\\iTop\\Application\\Search\\SearchForm' => __DIR__ . '/../..' . '/sources/Application/Search/searchform.class.inc.php',
-        'Combodo\\iTop\\Application\\Status\\Status' => __DIR__ . '/../..' . '/sources/Application/Status/Status.php',
+        'Combodo\\iTop\\Application\\Search\\AjaxSearchException' => __DIR__ . '/../..' . '/sources/Application/search/ajaxsearchexception.class.inc.php',
+        'Combodo\\iTop\\Application\\Search\\CriterionConversionAbstract' => __DIR__ . '/../..' . '/sources/Application/search/criterionconversionabstract.class.inc.php',
+        'Combodo\\iTop\\Application\\Search\\CriterionConversion\\CriterionToOQL' => __DIR__ . '/../..' . '/sources/Application/search/criterionconversion/criteriontooql.class.inc.php',
+        'Combodo\\iTop\\Application\\Search\\CriterionConversion\\CriterionToSearchForm' => __DIR__ . '/../..' . '/sources/Application/search/criterionconversion/criteriontosearchform.class.inc.php',
+        'Combodo\\iTop\\Application\\Search\\CriterionParser' => __DIR__ . '/../..' . '/sources/Application/search/criterionparser.class.inc.php',
+        'Combodo\\iTop\\Application\\Search\\SearchForm' => __DIR__ . '/../..' . '/sources/Application/search/searchform.class.inc.php',
+        'Combodo\\iTop\\Application\\Status\\Status' => __DIR__ . '/../..' . '/sources/Application/status/Status.php',
         'Combodo\\iTop\\Application\\TwigBase\\Controller\\Controller' => __DIR__ . '/../..' . '/sources/Application/TwigBase/Controller/Controller.php',
         'Combodo\\iTop\\Application\\TwigBase\\Controller\\PageNotFoundException' => __DIR__ . '/../..' . '/application/exceptions/PageNotFoundException.php',
         'Combodo\\iTop\\Application\\TwigBase\\Twig\\Extension' => __DIR__ . '/../..' . '/sources/Application/TwigBase/Twig/Extension.php',
@@ -794,6 +794,7 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
         'CryptEngine' => __DIR__ . '/../..' . '/core/simplecrypt.class.inc.php',
         'CustomFieldsHandler' => __DIR__ . '/../..' . '/core/customfieldshandler.class.inc.php',
         'DBObject' => __DIR__ . '/../..' . '/core/dbobject.class.php',
+        'DBObjectSearch' => __DIR__ . '/../..' . '/core/dbobjectsearch.class.php',
         'DBObjectSet' => __DIR__ . '/../..' . '/core/dbobjectset.class.php',
         'DBObjectSetComparator' => __DIR__ . '/../..' . '/core/dbobjectset.class.php',
         'DBProperty' => __DIR__ . '/../..' . '/core/dbproperty.class.inc.php',
@@ -1730,6 +1731,8 @@ class ComposerStaticInit7f81b4a2a468a061c306af5e447a9a9f
         'Psr\\Log\\NullLogger' => __DIR__ . '/..' . '/psr/log/Psr/Log/NullLogger.php',
         'QRcode' => __DIR__ . '/..' . '/combodo/tcpdf/include/barcodes/qrcode.php',
         'Query' => __DIR__ . '/../..' . '/application/query.class.inc.php',
+        'QueryBuilderContext' => __DIR__ . '/../..' . '/core/querybuildercontext.class.inc.php',
+        'QueryBuilderExpressions' => __DIR__ . '/../..' . '/core/querybuilderexpressions.class.inc.php',
         'QueryOQL' => __DIR__ . '/../..' . '/application/query.class.inc.php',
         'QueryReflection' => __DIR__ . '/../..' . '/core/modelreflection.class.inc.php',
         'QueryReflectionRuntime' => __DIR__ . '/../..' . '/core/modelreflection.class.inc.php',