Merge branch 'feature/search' into 'release/6.5'

gender



See merge request !1239

@@ -255,7 +255,7 @@ exports.filter = (req, res, next) => {
 
         _.assign(req.query, currentUrlParams, {shop_id: shopId});
     } else {
-        currentUrlParams = listParamsProcess.getParams(req.query.currentUrl);
+        currentUrlParams = listParamsProcess.getParams(_.last(_.split(req.query.currentUrl, '/')));
     }
 
     delete req.query.currentUrl;