diff --git a/.platform/schema b/.platform/schema
index 62f945751..c7930257d 100644
--- a/.platform/schema
+++ b/.platform/schema
@@ -1 +1 @@
-6
\ No newline at end of file
+7
\ No newline at end of file
diff --git a/compose.yaml b/compose.yaml
index 0e16d19ef..99f55b275 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -100,17 +100,17 @@ services:
       - internal
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.nginx.entrypoints=https"
-      - "traefik.http.routers.nginx.rule=Host(`elastic-proxy-${DRUPAL_HOSTNAME}`)"
-      - "traefik.http.services.nginx.loadbalancer.server.port=8080"
-      - "traefik.http.routers.nginx.tls=true"
+      - "traefik.http.routers.${COMPOSE_PROJECT_NAME}-elastic-proxy.entrypoints=https"
+      - "traefik.http.routers.${COMPOSE_PROJECT_NAME}-elastic-proxy.rule=Host(`elastic-proxy-${DRUPAL_HOSTNAME}`)"
+      - "traefik.http.routers.${COMPOSE_PROJECT_NAME}-elastic-proxy.tls=true"
+      - "traefik.http.services.${COMPOSE_PROJECT_NAME}-elastic-proxy.loadbalancer.server.port=8080"
       - "traefik.docker.network=stonehenge-network"
       - "traefik.http.middlewares.cors-header.headers.accesscontrolallowmethods=GET,OPTIONS,POST"
       - "traefik.http.middlewares.cors-header.headers.accesscontrolallowheaders=*"
       - "traefik.http.middlewares.cors-header.headers.accesscontrolalloworiginlist=*"
       - "traefik.http.middlewares.cors-header.headers.accesscontrolmaxage=100"
       - "traefik.http.middlewares.cors-header.headers.addvaryheader=true"
-      - "traefik.http.routers.nginx.middlewares=cors-header"
+      - "traefik.http.routers.${COMPOSE_PROJECT_NAME}-elastic-proxy.middlewares=cors-header"
     depends_on:
       - elastic
     profiles:
diff --git a/composer.lock b/composer.lock
index fc44becc3..8f7ddc9ff 100644
--- a/composer.lock
+++ b/composer.lock
@@ -3654,27 +3654,27 @@
         },
         {
             "name": "drupal/gin",
-            "version": "3.0.0-rc10",
+            "version": "3.0.0-rc11",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/gin.git",
-                "reference": "8.x-3.0-rc10"
+                "reference": "8.x-3.0-rc11"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/gin-8.x-3.0-rc10.zip",
-                "reference": "8.x-3.0-rc10",
-                "shasum": "f79fd895dd1f16c3af457bfaed5527f5b5bc752c"
+                "url": "https://ftp.drupal.org/files/projects/gin-8.x-3.0-rc11.zip",
+                "reference": "8.x-3.0-rc11",
+                "shasum": "532000cb8497412fb4b26efc362c7fc9efc44546"
             },
             "require": {
-                "drupal/core": "^9 || ^10",
+                "drupal/core": "^9 || ^10 || ^11",
                 "drupal/gin_toolbar": "^1.0@beta"
             },
             "type": "drupal-theme",
             "extra": {
                 "drupal": {
-                    "version": "8.x-3.0-rc10",
-                    "datestamp": "1712686345",
+                    "version": "8.x-3.0-rc11",
+                    "datestamp": "1718354743",
                     "security-coverage": {
                         "status": "not-covered",
                         "message": "RC releases are not covered by Drupal security advisories."
@@ -3716,26 +3716,26 @@
         },
         {
             "name": "drupal/gin_toolbar",
-            "version": "1.0.0-rc5",
+            "version": "1.0.0-rc6",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/gin_toolbar.git",
-                "reference": "8.x-1.0-rc5"
+                "reference": "8.x-1.0-rc6"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/gin_toolbar-8.x-1.0-rc5.zip",
-                "reference": "8.x-1.0-rc5",
-                "shasum": "523b565244440a16fa447065a98841770992bd2e"
+                "url": "https://ftp.drupal.org/files/projects/gin_toolbar-8.x-1.0-rc6.zip",
+                "reference": "8.x-1.0-rc6",
+                "shasum": "542def14b9a5435efb4e021d384fa3f7b0fc6e78"
             },
             "require": {
-                "drupal/core": "^9 || ^10"
+                "drupal/core": "^9 || ^10 || ^11"
             },
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "8.x-1.0-rc5",
-                    "datestamp": "1702727588",
+                    "version": "8.x-1.0-rc6",
+                    "datestamp": "1718368950",
                     "security-coverage": {
                         "status": "not-covered",
                         "message": "RC releases are not covered by Drupal security advisories."
@@ -3828,16 +3828,16 @@
         },
         {
             "name": "drupal/hdbt",
-            "version": "6.5.20",
+            "version": "6.5.25",
             "source": {
                 "type": "git",
                 "url": "https://github.com/City-of-Helsinki/drupal-hdbt.git",
-                "reference": "f0a50c9225f2e0904399bb961d798f54f34e964a"
+                "reference": "6886c53bbfbec86faa70ed02af3849ec5bf35f65"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/f0a50c9225f2e0904399bb961d798f54f34e964a",
-                "reference": "f0a50c9225f2e0904399bb961d798f54f34e964a",
+                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-hdbt/zipball/6886c53bbfbec86faa70ed02af3849ec5bf35f65",
+                "reference": "6886c53bbfbec86faa70ed02af3849ec5bf35f65",
                 "shasum": ""
             },
             "require": {
@@ -3855,10 +3855,10 @@
                 "Drupal"
             ],
             "support": {
-                "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.5.20",
+                "source": "https://github.com/City-of-Helsinki/drupal-hdbt/tree/6.5.25",
                 "issues": "https://github.com/City-of-Helsinki/drupal-hdbt/issues"
             },
-            "time": "2024-06-11T12:33:07+00:00"
+            "time": "2024-06-19T06:40:55+00:00"
         },
         {
             "name": "drupal/hdbt_admin",
@@ -3897,27 +3897,27 @@
         },
         {
             "name": "drupal/health_check",
-            "version": "3.0.0",
+            "version": "3.1.0",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/health_check.git",
-                "reference": "3.0.0"
+                "reference": "3.1.0"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/health_check-3.0.0.zip",
-                "reference": "3.0.0",
-                "shasum": "7a08e19c97d788f46d6ff4448df96561908e92d5"
+                "url": "https://ftp.drupal.org/files/projects/health_check-3.1.0.zip",
+                "reference": "3.1.0",
+                "shasum": "7c72666fa1c0c688f7f27f5cad2a0e29a934d5d0"
             },
             "require": {
-                "drupal/core": "^9.4 || ^10",
+                "drupal/core": "^9.4 || ^10 || ^11",
                 "php": "^8.0"
             },
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "3.0.0",
-                    "datestamp": "1671533283",
+                    "version": "3.1.0",
+                    "datestamp": "1718772797",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -4037,12 +4037,12 @@
             "source": {
                 "type": "git",
                 "url": "https://github.com/City-of-Helsinki/drupal-tools.git",
-                "reference": "9b33c808570b6e8daea537fd96885f9fe7246274"
+                "reference": "cea692973b01424a3c3ffde13b9db48edbcbf6c9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/9b33c808570b6e8daea537fd96885f9fe7246274",
-                "reference": "9b33c808570b6e8daea537fd96885f9fe7246274",
+                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-tools/zipball/cea692973b01424a3c3ffde13b9db48edbcbf6c9",
+                "reference": "cea692973b01424a3c3ffde13b9db48edbcbf6c9",
                 "shasum": ""
             },
             "require": {
@@ -4114,7 +4114,7 @@
                 "source": "https://github.com/City-of-Helsinki/drupal-tools/tree/main",
                 "issues": "https://github.com/City-of-Helsinki/drupal-tools/issues"
             },
-            "time": "2024-05-21T06:26:52+00:00"
+            "time": "2024-06-12T09:40:19+00:00"
         },
         {
             "name": "drupal/helfi_navigation",
@@ -4152,16 +4152,16 @@
         },
         {
             "name": "drupal/helfi_platform_config",
-            "version": "4.3.63",
+            "version": "4.3.64",
             "source": {
                 "type": "git",
                 "url": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config.git",
-                "reference": "cc8dc035535a7a5d00846b8a7f3aaebd87297926"
+                "reference": "b6246e6703ea4aa22cc635a29156fcbb5924b5fe"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/cc8dc035535a7a5d00846b8a7f3aaebd87297926",
-                "reference": "cc8dc035535a7a5d00846b8a7f3aaebd87297926",
+                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-helfi-platform-config/zipball/b6246e6703ea4aa22cc635a29156fcbb5924b5fe",
+                "reference": "b6246e6703ea4aa22cc635a29156fcbb5924b5fe",
                 "shasum": ""
             },
             "require": {
@@ -4264,6 +4264,9 @@
                     },
                     "drupal/view_unpublished": {
                         "[#UHF-9256] Fix missing dynamic permission dependencies.": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/cbb944ae79643ba7ed895db3fac7f3b3d90ac850/patches/view_unpublished_permissions_missing_dependencies.patch"
+                    },
+                    "drupal/elasticsearch_connector": {
+                        "https://www.drupal.org/project/elasticsearch_connector/issues/3454977": "https://raw.githubusercontent.com/City-of-Helsinki/drupal-helfi-platform-config/959fd61553c8827b7350e53de4f66b2f6b8c97a1/patches/issue-3454977.patch"
                     }
                 }
             },
@@ -4272,10 +4275,10 @@
             ],
             "description": "HELfi platform config",
             "support": {
-                "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.3.63",
+                "source": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/tree/4.3.64",
                 "issues": "https://github.com/City-of-Helsinki/drupal-helfi-platform-config/issues"
             },
-            "time": "2024-06-12T08:50:06+00:00"
+            "time": "2024-06-18T12:35:32+00:00"
         },
         {
             "name": "drupal/helfi_proxy",
@@ -4373,16 +4376,16 @@
         },
         {
             "name": "drupal/helfi_tunnistamo",
-            "version": "3.0.6",
+            "version": "3.0.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo.git",
-                "reference": "e968d82a3399dc98df148085e75c024e2cb85396"
+                "reference": "881201f804fd6350c8c4705a677619b25fd49c72"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tunnistamo/zipball/e968d82a3399dc98df148085e75c024e2cb85396",
-                "reference": "e968d82a3399dc98df148085e75c024e2cb85396",
+                "url": "https://api.github.com/repos/City-of-Helsinki/drupal-module-helfi-tunnistamo/zipball/881201f804fd6350c8c4705a677619b25fd49c72",
+                "reference": "881201f804fd6350c8c4705a677619b25fd49c72",
                 "shasum": ""
             },
             "require": {
@@ -4399,10 +4402,10 @@
             ],
             "description": "Tunnistamo integration",
             "support": {
-                "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo/tree/3.0.6",
+                "source": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo/tree/3.0.7",
                 "issues": "https://github.com/City-of-Helsinki/drupal-module-helfi-tunnistamo/issues"
             },
-            "time": "2024-04-30T10:07:43+00:00"
+            "time": "2024-06-18T07:56:54+00:00"
         },
         {
             "name": "drupal/image_style_quality",
@@ -6757,17 +6760,17 @@
         },
         {
             "name": "drupal/search_api",
-            "version": "1.34.0",
+            "version": "1.35.0",
             "source": {
                 "type": "git",
                 "url": "https://git.drupalcode.org/project/search_api.git",
-                "reference": "8.x-1.34"
+                "reference": "8.x-1.35"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/search_api-8.x-1.34.zip",
-                "reference": "8.x-1.34",
-                "shasum": "dd08166888f90adaf01cc1a759266097709efe7c"
+                "url": "https://ftp.drupal.org/files/projects/search_api-8.x-1.35.zip",
+                "reference": "8.x-1.35",
+                "shasum": "d119726e870f793c6470d2a4fa9286662c5eb45d"
             },
             "require": {
                 "drupal/core": "^10.1 || ^11"
@@ -6788,8 +6791,8 @@
             "type": "drupal-module",
             "extra": {
                 "drupal": {
-                    "version": "8.x-1.34",
-                    "datestamp": "1714899074",
+                    "version": "8.x-1.35",
+                    "datestamp": "1718551025",
                     "security-coverage": {
                         "status": "covered",
                         "message": "Covered by Drupal's security advisory policy"
@@ -15253,16 +15256,16 @@
         },
         {
             "name": "composer/class-map-generator",
-            "version": "1.3.3",
+            "version": "1.3.4",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/class-map-generator.git",
-                "reference": "61804f9973685ec7bead0fb7fe022825e3cd418e"
+                "reference": "b1b3fd0b4eaf3ddf3ee230bc340bf3fff454a1a3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/class-map-generator/zipball/61804f9973685ec7bead0fb7fe022825e3cd418e",
-                "reference": "61804f9973685ec7bead0fb7fe022825e3cd418e",
+                "url": "https://api.github.com/repos/composer/class-map-generator/zipball/b1b3fd0b4eaf3ddf3ee230bc340bf3fff454a1a3",
+                "reference": "b1b3fd0b4eaf3ddf3ee230bc340bf3fff454a1a3",
                 "shasum": ""
             },
             "require": {
@@ -15306,7 +15309,7 @@
             ],
             "support": {
                 "issues": "https://github.com/composer/class-map-generator/issues",
-                "source": "https://github.com/composer/class-map-generator/tree/1.3.3"
+                "source": "https://github.com/composer/class-map-generator/tree/1.3.4"
             },
             "funding": [
                 {
@@ -15322,7 +15325,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2024-06-10T11:53:54+00:00"
+            "time": "2024-06-12T14:13:04+00:00"
         },
         {
             "name": "composer/composer",
diff --git a/conf/cmi/language/de/filter.format.plain_text.yml b/conf/cmi/language/de/filter.format.plain_text.yml
index 868f577fe..bdedbdc76 100644
--- a/conf/cmi/language/de/filter.format.plain_text.yml
+++ b/conf/cmi/language/de/filter.format.plain_text.yml
@@ -1 +1 @@
-name: 'Unformatierter Text'
+name: Klartext
diff --git a/conf/cmi/language/de/views.view.archive.yml b/conf/cmi/language/de/views.view.archive.yml
index 3b54e3568..d2ea9ee3a 100644
--- a/conf/cmi/language/de/views.view.archive.yml
+++ b/conf/cmi/language/de/views.view.archive.yml
@@ -18,7 +18,7 @@ display:
         options:
           submit_button: Anwenden
           reset_button_label: Zurücksetzen
-          exposed_sorts_label: 'Sortieren nach'
+          exposed_sorts_label: Sortierung
           sort_asc_label: Aufsteigend
           sort_desc_label: Absteigend
       arguments:
diff --git a/conf/cmi/language/de/views.view.content.yml b/conf/cmi/language/de/views.view.content.yml
index 92edf930b..444a64a19 100644
--- a/conf/cmi/language/de/views.view.content.yml
+++ b/conf/cmi/language/de/views.view.content.yml
@@ -25,15 +25,15 @@ display:
       pager:
         options:
           tags:
-            next: 'Nächste Seite ›'
-            previous: '‹ Vorherige Seite'
+            next: 'Weiter ›'
+            previous: '‹ Zurück'
             first: '« Anfang'
             last: 'Ende »'
       exposed_form:
         options:
           submit_button: Filter
           reset_button_label: Zurücksetzen
-          exposed_sorts_label: 'Sortieren nach'
+          exposed_sorts_label: Sortierung
           sort_asc_label: Aufsteigend
           sort_desc_label: Absteigend
       empty:
diff --git a/conf/cmi/language/de/views.view.content_recent.yml b/conf/cmi/language/de/views.view.content_recent.yml
index fe3e6cee9..40b73cbef 100644
--- a/conf/cmi/language/de/views.view.content_recent.yml
+++ b/conf/cmi/language/de/views.view.content_recent.yml
@@ -12,7 +12,7 @@ display:
         options:
           submit_button: Anwenden
           reset_button_label: Zurücksetzen
-          exposed_sorts_label: 'Sortieren nach'
+          exposed_sorts_label: Sortierung
           sort_asc_label: Aufsteigend
           sort_desc_label: Absteigend
       empty:
diff --git a/conf/cmi/language/de/views.view.files.yml b/conf/cmi/language/de/views.view.files.yml
index 44dc12e52..2e2cc1bec 100644
--- a/conf/cmi/language/de/views.view.files.yml
+++ b/conf/cmi/language/de/views.view.files.yml
@@ -32,8 +32,8 @@ display:
       pager:
         options:
           tags:
-            next: 'Nächste Seite ›'
-            previous: '‹ Vorherige Seite'
+            next: 'Weiter ›'
+            previous: '‹ Zurück'
           expose:
             items_per_page_label: 'Elemente pro Seite'
             items_per_page_options_all_label: '- Alle -'
@@ -42,7 +42,7 @@ display:
         options:
           submit_button: Filter
           reset_button_label: Zurücksetzen
-          exposed_sorts_label: 'Sortieren nach'
+          exposed_sorts_label: Sortierung
           sort_asc_label: Aufsteigend
           sort_desc_label: Absteigend
       empty:
@@ -80,8 +80,8 @@ display:
       pager:
         options:
           tags:
-            next: 'Nächste Seite ›'
-            previous: '‹ Vorherige Seite'
+            next: 'Weiter ›'
+            previous: '‹ Zurück'
           expose:
             items_per_page_label: 'Elemente pro Seite'
             items_per_page_options_all_label: '- Alle -'
diff --git a/conf/cmi/language/de/views.view.glossary.yml b/conf/cmi/language/de/views.view.glossary.yml
index ef170a57f..b4eedbe09 100644
--- a/conf/cmi/language/de/views.view.glossary.yml
+++ b/conf/cmi/language/de/views.view.glossary.yml
@@ -24,7 +24,7 @@ display:
         options:
           submit_button: Anwenden
           reset_button_label: Zurücksetzen
-          exposed_sorts_label: 'Sortieren nach'
+          exposed_sorts_label: Sortierung
           sort_asc_label: Aufsteigend
           sort_desc_label: Absteigend
   attachment_1:
diff --git a/conf/cmi/language/de/views.view.locked_content.yml b/conf/cmi/language/de/views.view.locked_content.yml
index fcd3bef9f..2e462c52f 100644
--- a/conf/cmi/language/de/views.view.locked_content.yml
+++ b/conf/cmi/language/de/views.view.locked_content.yml
@@ -7,7 +7,7 @@ display:
         options:
           submit_button: Anwenden
           reset_button_label: Zurücksetzen
-          exposed_sorts_label: 'Sortieren nach'
+          exposed_sorts_label: Sortierung
           sort_asc_label: Aufsteigend
           sort_desc_label: Absteigend
       pager:
diff --git a/conf/cmi/language/de/views.view.media.yml b/conf/cmi/language/de/views.view.media.yml
index dc5d2e3aa..31ad3fde7 100644
--- a/conf/cmi/language/de/views.view.media.yml
+++ b/conf/cmi/language/de/views.view.media.yml
@@ -34,8 +34,8 @@ display:
       pager:
         options:
           tags:
-            next: 'Nächste Seite ›'
-            previous: '‹ Vorherige Seite'
+            next: 'Weiter ›'
+            previous: '‹ Zurück'
             first: '« Anfang'
             last: 'Ende »'
           expose:
@@ -46,7 +46,7 @@ display:
         options:
           submit_button: Filter
           reset_button_label: Zurücksetzen
-          exposed_sorts_label: 'Sortieren nach'
+          exposed_sorts_label: Sortierung
           sort_asc_label: Aufsteigend
           sort_desc_label: Absteigend
       empty:
diff --git a/conf/cmi/language/de/views.view.media_library.yml b/conf/cmi/language/de/views.view.media_library.yml
index 3dc61bb57..8dea96bd4 100644
--- a/conf/cmi/language/de/views.view.media_library.yml
+++ b/conf/cmi/language/de/views.view.media_library.yml
@@ -21,7 +21,7 @@ display:
         options:
           submit_button: 'Filter anwenden'
           reset_button_label: Zurücksetzen
-          exposed_sorts_label: 'Sortieren nach'
+          exposed_sorts_label: Sortierung
           sort_asc_label: Aufsteigend
           sort_desc_label: Absteigend
       empty:
diff --git a/conf/cmi/language/de/views.view.news.yml b/conf/cmi/language/de/views.view.news.yml
index 4c1624440..5ed8d37e8 100644
--- a/conf/cmi/language/de/views.view.news.yml
+++ b/conf/cmi/language/de/views.view.news.yml
@@ -13,7 +13,7 @@ display:
         options:
           submit_button: Anwenden
           reset_button_label: Zurücksetzen
-          exposed_sorts_label: 'Sortieren nach'
+          exposed_sorts_label: Sortierung
           sort_asc_label: Aufsteigend
           sort_desc_label: Absteigend
       arguments:
diff --git a/conf/cmi/language/de/views.view.paragraphs_library.yml b/conf/cmi/language/de/views.view.paragraphs_library.yml
index 915e4c054..40b760369 100644
--- a/conf/cmi/language/de/views.view.paragraphs_library.yml
+++ b/conf/cmi/language/de/views.view.paragraphs_library.yml
@@ -7,7 +7,7 @@ display:
         options:
           submit_button: Filter
           reset_button_label: Zurücksetzen
-          exposed_sorts_label: 'Sortieren nach'
+          exposed_sorts_label: Sortierung
           sort_asc_label: Aufsteigend
           sort_desc_label: Absteigend
       pager:
diff --git a/conf/cmi/language/de/views.view.redirect.yml b/conf/cmi/language/de/views.view.redirect.yml
index 461904ad3..a0d83ab43 100644
--- a/conf/cmi/language/de/views.view.redirect.yml
+++ b/conf/cmi/language/de/views.view.redirect.yml
@@ -8,7 +8,7 @@ display:
         options:
           submit_button: Filter
           reset_button_label: Zurücksetzen
-          exposed_sorts_label: 'Sortieren nach'
+          exposed_sorts_label: Sortierung
           sort_asc_label: Aufsteigend
           sort_desc_label: Absteigend
       pager:
@@ -44,19 +44,19 @@ display:
             label: Statuscode
             group_items:
               1:
-                title: '300 Multiple Choices'
+                title: '300 Mehrere Auswahlmöglichkeiten'
               2:
-                title: '301 Moved Permanently'
+                title: '301 Dauerhaft verschoben'
               3:
-                title: '302 Found'
+                title: '302 Gefunden'
               4:
-                title: '303 See Other'
+                title: '303 Siehe andere'
               5:
-                title: '304 Not Modified'
+                title: '304 Nicht modifiziert'
               6:
-                title: '305 Use Proxy'
+                title: '305 Proxy verwenden'
               7:
-                title: '307 Temporary Redirect'
+                title: '307 Temporäre Weiterleitung'
         language:
           expose:
             label: Originalsprache
diff --git a/conf/cmi/language/de/views.view.scheduler_scheduled_content.yml b/conf/cmi/language/de/views.view.scheduler_scheduled_content.yml
index 207fcd5bf..67f64a96e 100644
--- a/conf/cmi/language/de/views.view.scheduler_scheduled_content.yml
+++ b/conf/cmi/language/de/views.view.scheduler_scheduled_content.yml
@@ -7,7 +7,7 @@ display:
         options:
           submit_button: Filter
           reset_button_label: Zurücksetzen
-          exposed_sorts_label: 'Sortieren nach'
+          exposed_sorts_label: Sortierung
           sort_asc_label: Aufsteigend
           sort_desc_label: Absteigend
       pager:
diff --git a/conf/cmi/language/de/views.view.taxonomy_term.yml b/conf/cmi/language/de/views.view.taxonomy_term.yml
index 514248148..e6c2212cc 100644
--- a/conf/cmi/language/de/views.view.taxonomy_term.yml
+++ b/conf/cmi/language/de/views.view.taxonomy_term.yml
@@ -17,7 +17,7 @@ display:
         options:
           submit_button: Anwenden
           reset_button_label: Zurücksetzen
-          exposed_sorts_label: 'Sortieren nach'
+          exposed_sorts_label: Sortierung
           sort_asc_label: Aufsteigend
           sort_desc_label: Absteigend
       arguments:
diff --git a/conf/cmi/language/de/views.view.user_admin_people.yml b/conf/cmi/language/de/views.view.user_admin_people.yml
index 111806e3f..ba10069f8 100644
--- a/conf/cmi/language/de/views.view.user_admin_people.yml
+++ b/conf/cmi/language/de/views.view.user_admin_people.yml
@@ -34,8 +34,8 @@ display:
       pager:
         options:
           tags:
-            next: 'Nächste Seite ›'
-            previous: '‹ Vorherige Seite'
+            next: 'Weiter ›'
+            previous: '‹ Zurück'
             first: '« Anfang'
             last: 'Ende »'
           expose:
@@ -46,7 +46,7 @@ display:
         options:
           submit_button: Filter
           reset_button_label: Zurücksetzen
-          exposed_sorts_label: 'Sortieren nach'
+          exposed_sorts_label: Sortierung
           sort_asc_label: Aufsteigend
           sort_desc_label: Absteigend
       empty:
diff --git a/conf/cmi/language/de/views.view.who_s_new.yml b/conf/cmi/language/de/views.view.who_s_new.yml
index 555f9e076..69e66b1c8 100644
--- a/conf/cmi/language/de/views.view.who_s_new.yml
+++ b/conf/cmi/language/de/views.view.who_s_new.yml
@@ -9,7 +9,7 @@ display:
         options:
           submit_button: Anwenden
           reset_button_label: Zurücksetzen
-          exposed_sorts_label: 'Sortieren nach'
+          exposed_sorts_label: Sortierung
           sort_asc_label: Aufsteigend
           sort_desc_label: Absteigend
   block_1:
diff --git a/conf/cmi/language/de/views.view.who_s_online.yml b/conf/cmi/language/de/views.view.who_s_online.yml
index bce63f629..69a87fefe 100644
--- a/conf/cmi/language/de/views.view.who_s_online.yml
+++ b/conf/cmi/language/de/views.view.who_s_online.yml
@@ -9,7 +9,7 @@ display:
         options:
           submit_button: Anwenden
           reset_button_label: Zurücksetzen
-          exposed_sorts_label: 'Sortieren nach'
+          exposed_sorts_label: Sortierung
           sort_asc_label: Aufsteigend
           sort_desc_label: Absteigend
       empty:
diff --git a/conf/cmi/language/et/language.entity.et.yml b/conf/cmi/language/et/language.entity.et.yml
index 545fbf71a..b692a6558 100644
--- a/conf/cmi/language/et/language.entity.et.yml
+++ b/conf/cmi/language/et/language.entity.et.yml
@@ -1 +1 @@
-label: Eesti keel
+label: 'Eesti keel'
diff --git a/conf/cmi/language/fa/core.entity_form_mode.media.media_library.yml b/conf/cmi/language/fa/core.entity_form_mode.media.media_library.yml
new file mode 100644
index 000000000..03e2d6dae
--- /dev/null
+++ b/conf/cmi/language/fa/core.entity_form_mode.media.media_library.yml
@@ -0,0 +1 @@
+label: 'Media library'
diff --git a/conf/cmi/language/fa/core.entity_view_mode.media.media_library.yml b/conf/cmi/language/fa/core.entity_view_mode.media.media_library.yml
new file mode 100644
index 000000000..03e2d6dae
--- /dev/null
+++ b/conf/cmi/language/fa/core.entity_view_mode.media.media_library.yml
@@ -0,0 +1 @@
+label: 'Media library'
diff --git a/conf/cmi/language/fa/views.view.media_library.yml b/conf/cmi/language/fa/views.view.media_library.yml
index 22524a122..d99bc4557 100644
--- a/conf/cmi/language/fa/views.view.media_library.yml
+++ b/conf/cmi/language/fa/views.view.media_library.yml
@@ -81,3 +81,4 @@ display:
           label: شبکه
         display_link_table:
           label: جدول
+label: 'Media library'
diff --git a/docker/elastic-proxy/elastic.conf b/docker/elastic-proxy/elastic.conf
index 89203d0cc..3e77318e2 100644
--- a/docker/elastic-proxy/elastic.conf
+++ b/docker/elastic-proxy/elastic.conf
@@ -8,7 +8,7 @@ server {
       return 200 '{"status":"success","result":"Proxy alive"}';
     }
 
-    location ~ ^/([a-z][a-z_-]*)/(_search|_msearch)$ {
+    location ~ ^/([a-z][a-z_,-]*)/(_search|_msearch)$ {
         limit_except GET POST {
            deny all;
         }