diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a7926f71ea96f1008ec87ff5674add229cd382fb..fa6ec433b174a44058de143cd39c74c63b62aa8c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,8 +1,10 @@
-before_script:
-        - export PIP_CACHE_DIR="pip-cache"
+variables:
+        PIP_CACHE_DIR: "$CI_PROJECT_DIR/pip-cache"
+
 cache:
         paths:
-                - pip-cache
+                - "$CI_PROJECT_DIR/pip-cache"
+        key: "$CI_PROJECT_ID"
 job test:
         script:
                 - tox
diff --git a/src/representatives/filters.py b/src/representatives/filters.py
index a0807f33b73f70e29b92dc690a3170c423c547e3..41abc89fe408462f4e194a9af5983ed28391c01b 100644
--- a/src/representatives/filters.py
+++ b/src/representatives/filters.py
@@ -4,6 +4,7 @@ from datetime import datetime
 from rest_framework.filters import BaseFilterBackend
 from django.db.models import Q
 from django.conf import settings
+from django.utils.http import urlunquote
 
 
 from .models import Mandate
@@ -49,7 +50,7 @@ class ActiveConstituencyFilterBackend(BaseFilterBackend):
 
         if self.query_param in request.GET:
             if len(request.GET[self.query_params]):
-                mandates = request.GET[self.query_param].split(',')
+                mandates = urlunquote(request.GET[self.query_param]).split(',')
                 qs = qs.filter(mandates__in=Mandate.objects.filter(
                     Q(end_date__gte=datetime.today) |
                     Q(end_date__isnull=True)).filter(