diff --git a/src/Controller/EntryController.php b/src/Controller/EntryController.php
index 07e4af943..7f184d2b5 100644
--- a/src/Controller/EntryController.php
+++ b/src/Controller/EntryController.php
@@ -625,7 +625,7 @@ class EntryController extends AbstractController
      */
     private function showEntries($type, Request $request, $page)
     {
-        $searchTerm = (isset($request->query->get('search_entry')['term']) ? trim($request->query->get('search_entry')['term']) : '');
+        $searchTerm = (isset($request->query->all('search_entry')['term']) ? trim($request->query->all('search_entry')['term']) : '');
         $currentRoute = (null !== $request->query->get('currentRoute') ? $request->query->get('currentRoute') : '');
         $currentEntryId = $request->attributes->getInt('id');
 
diff --git a/src/Controller/ExportController.php b/src/Controller/ExportController.php
index 1a65c7a9e..ce622a956 100644
--- a/src/Controller/ExportController.php
+++ b/src/Controller/ExportController.php
@@ -77,7 +77,7 @@ class ExportController extends AbstractController
 
             $title = 'Tag ' . $tag->getLabel();
         } elseif ('search' === $category) {
-            $searchTerm = (isset($request->query->get('search_entry')['term']) ? $request->query->get('search_entry')['term'] : '');
+            $searchTerm = (isset($request->query->all('search_entry')['term']) ? $request->query->all('search_entry')['term'] : '');
             $currentRoute = (null !== $request->query->get('currentRoute') ? $request->query->get('currentRoute') : '');
 
             $entries = $entryRepository->getBuilderForSearchByUser(
diff --git a/src/Controller/UserController.php b/src/Controller/UserController.php
index 8209d46fb..5be29a6cc 100644
--- a/src/Controller/UserController.php
+++ b/src/Controller/UserController.php
@@ -161,7 +161,7 @@ class UserController extends AbstractController
         $form->handleRequest($request);
 
         if ($form->isSubmitted() && $form->isValid()) {
-            $searchTerm = (isset($request->query->get('search_user')['term']) ? $request->query->get('search_user')['term'] : '');
+            $searchTerm = (isset($request->query->all('search_user')['term']) ? $request->query->all('search_user')['term'] : '');
 
             $qb = $userRepository->getQueryBuilderForSearch($searchTerm);
         }
diff --git a/src/HttpClient/WallabagClient.php b/src/HttpClient/WallabagClient.php
index 1d3fcec6d..8b3f294bb 100644
--- a/src/HttpClient/WallabagClient.php
+++ b/src/HttpClient/WallabagClient.php
@@ -67,6 +67,11 @@ class WallabagClient implements HttpClientInterface
         return $this->httpClient->stream($responses, $timeout);
     }
 
+    public function withOptions(array $options): HttpClientInterface
+    {
+        return new self($this->restrictedAccess, $this->browser, $this->authenticator, $this->logger);
+    }
+
     private function getCookieHeader(string $url): ?string
     {
         $cookies = [];