diff --git a/templates/event/index.html.twig b/templates/event/index.html.twig
index e4d2fd9..91ee1d8 100644
--- a/templates/event/index.html.twig
+++ b/templates/event/index.html.twig
@@ -52,7 +52,7 @@
             <dl class="divide-y divide-gray-200 overflow-hidden rounded-lg bg-white shadow ring-1 ring-black ring-opacity-5 w-2/3 sticky top-4">
                 <div class="text-sm text-gray-500">
                     {% for event in events %}
-                        {% if event.name == app.request.get('name') %}
+                        {% if event.name == app.request.query.get('name') %}
 
                             <div class="px-4 py-6 bg-gray-50 text-gray-500 font-semibold">
                                 Details
@@ -92,7 +92,7 @@
                         {% endif %}
                     {% endfor %}
 
-                    {% if not app.request.get('name') %}
+                    {% if not app.request.query.get('name') %}
 
                         <div class="py-24 text-xl text-gray-400 text-center">
                             {{ heroicon('calendar', 'h-12 w-12 text-gray-400 mx-auto mb-2') }}
diff --git a/templates/inspection/index.html.twig b/templates/inspection/index.html.twig
index fbc7377..f0f3f9b 100644
--- a/templates/inspection/index.html.twig
+++ b/templates/inspection/index.html.twig
@@ -17,11 +17,11 @@
                     <label for="aggregate" class="block text-sm font-medium leading-6 text-gray-900">Aggregate</label>
                     <select required id="aggregate" name="aggregate"
                             class="mt-2 block w-full rounded-md border-0 py-1.5 pl-3 pr-10 text-gray-900 ring-1 ring-inset ring-gray-300 focus:ring-2 focus:ring-indigo-600 sm:text-sm sm:leading-6">
-                        <option {% if app.request.get('aggregate') == "" %}selected{% endif %}
+                        <option {% if app.request.query.get('aggregate') == "" %}selected{% endif %}
                                 value="">-- choose --
                         </option>
                         {% for aggregate in aggregates %}
-                            <option {% if app.request.get('aggregate') == aggregate %}selected{% endif %}
+                            <option {% if app.request.query.get('aggregate') == aggregate %}selected{% endif %}
                                     value="{{ aggregate }}">{{ aggregate }}</option>
                         {% endfor %}
                     </select>
@@ -34,7 +34,7 @@
                         <input type="text" name="aggregateId" id="aggregateId" required
                                class="block w-full rounded-md border-0 py-1.5 text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 placeholder:text-gray-400 focus:ring-2 focus:ring-inset focus:ring-indigo-600 sm:text-sm sm:leading-6"
                                placeholder="018d233e-7906-73f1-8a0c-f76a4fdac34e"
-                               value="{{ app.request.get('aggregateId') }}">
+                               value="{{ app.request.query.get('aggregateId') }}">
                     </div>
                 </div>
 
diff --git a/templates/pagination.html.twig b/templates/pagination.html.twig
index 1f3a9ec..bcbe857 100644
--- a/templates/pagination.html.twig
+++ b/templates/pagination.html.twig
@@ -3,7 +3,7 @@
 
 <nav class="flex items-center justify-between border-t border-gray-200 px-4 sm:px-0">
     <div class="-mt-px flex w-0 flex-1">
-        <a href="{{ path(app.request.get('_route'), app.request.query|merge({'page': page - 1})) }}" class="inline-flex items-center border-t-2 border-transparent p-4 text-sm font-medium text-gray-500 hover:border-gray-300 hover:text-gray-700">
+        <a href="{{ path(app.request.attributes.get('_route'), app.request.query|merge({'page': page - 1})) }}" class="inline-flex items-center border-t-2 border-transparent p-4 text-sm font-medium text-gray-500 hover:border-gray-300 hover:text-gray-700">
             <svg class="mr-3 h-5 w-5 text-gray-400" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
                 <path fill-rule="evenodd" d="M18 10a.75.75 0 01-.75.75H4.66l2.1 1.95a.75.75 0 11-1.02 1.1l-3.5-3.25a.75.75 0 010-1.1l3.5-3.25a.75.75 0 111.02 1.1l-2.1 1.95h12.59A.75.75 0 0118 10z" clip-rule="evenodd" />
             </svg>
@@ -14,7 +14,7 @@
         {% for p in 1..total %}
             {% if loop.first or loop.last or (p >= page - between and p <= page + between) %}
                 <a
-                        href="{{ path(app.request.get('_route'), app.request.query|merge({'page': p})) }}"
+                        href="{{ path(app.request.attributes.get('_route'), app.request.query|merge({'page': p})) }}"
                         class="{% if p == page %}border-indigo-500 text-indigo-600{% else %}border-transparent text-gray-500 hover:text-gray-700 hover:border-gray-300{% endif %} inline-flex items-center border-t-2 p-4 text-sm font-medium"
                 >{{ p }}</a>
             {% endif %}
@@ -26,7 +26,7 @@
     </div>
 
     <div class="-mt-px flex w-0 flex-1 justify-end">
-        <a href="{{ path(app.request.get('_route'), app.request.query|merge({'page': page + 1})) }}" class="inline-flex items-center border-t-2 border-transparent p-4 text-sm font-medium text-gray-500 hover:border-gray-300 hover:text-gray-700">
+        <a href="{{ path(app.request.attributes.get('_route'), app.request.query|merge({'page': page + 1})) }}" class="inline-flex items-center border-t-2 border-transparent p-4 text-sm font-medium text-gray-500 hover:border-gray-300 hover:text-gray-700">
             Next
             <svg class="ml-3 h-5 w-5 text-gray-400" viewBox="0 0 20 20" fill="currentColor" aria-hidden="true">
                 <path fill-rule="evenodd" d="M2 10a.75.75 0 01.75-.75h12.59l-2.1-1.95a.75.75 0 111.02-1.1l3.5 3.25a.75.75 0 010 1.1l-3.5 3.25a.75.75 0 11-1.02-1.1l2.1-1.95H2.75A.75.75 0 012 10z" clip-rule="evenodd" />
diff --git a/templates/store/show.html.twig b/templates/store/show.html.twig
index c0dad03..28be4f2 100644
--- a/templates/store/show.html.twig
+++ b/templates/store/show.html.twig
@@ -19,7 +19,7 @@
                             <input type="text" name="streamName" id="streamName"
                                    class="block w-full rounded-md border-0 py-1.5 text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 placeholder:text-gray-400 focus:ring-2 focus:ring-inset focus:ring-indigo-600 sm:text-sm sm:leading-6"
                                    placeholder="hotel-018d233e-7906-73f1-8a0c-f76a4fdac34e"
-                                   value="{{ app.request.get('streamName') }}">
+                                   value="{{ app.request.query.get('streamName') }}">
                         </div>
                     </div>
                     <div class="w-96">
@@ -29,11 +29,11 @@
                         <div class="mt-1">
                             <select id="event" name="event"
                                     class="mt-1 block w-full rounded-md border-0 py-1.5 pl-3 pr-10 text-gray-900 ring-1 ring-inset ring-gray-300 focus:ring-2 focus:ring-indigo-600 sm:text-sm sm:leading-6">
-                                <option {% if app.request.get('event') == "" %}selected{% endif %} value="">
+                                <option {% if app.request.query.get('event') == "" %}selected{% endif %} value="">
                                     -- choose --
                                 </option>
                                 {% for event in events %}
-                                    <option {% if app.request.get('event') == event %}selected{% endif %} value="{{ event }}">
+                                    <option {% if app.request.query.get('event') == event %}selected{% endif %} value="{{ event }}">
                                         {{ event }}
                                     </option>
                                 {% endfor %}
@@ -45,11 +45,11 @@
                         <label for="aggregate" class="block text-xs font-medium leading-6 text-gray-900">Aggregate</label>
                         <select id="aggregate" name="aggregate"
                                 class="mt-1 block w-full rounded-md border-0 py-1.5 pl-3 pr-10 text-gray-900 ring-1 ring-inset ring-gray-300 focus:ring-2 focus:ring-indigo-600 sm:text-sm sm:leading-6">
-                            <option {% if app.request.get('aggregate') == "" %}selected{% endif %}
+                            <option {% if app.request.query.get('aggregate') == "" %}selected{% endif %}
                                     value="">-- choose --
                             </option>
                             {% for aggregate in aggregates %}
-                                <option {% if app.request.get('aggregate') == aggregate %}selected{% endif %}
+                                <option {% if app.request.query.get('aggregate') == aggregate %}selected{% endif %}
                                         value="{{ aggregate }}">{{ aggregate }}</option>
                             {% endfor %}
                         </select>
@@ -63,7 +63,7 @@
                             <input type="text" name="aggregateId" id="aggregateId"
                                    class="block w-full rounded-md border-0 py-1.5 text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 placeholder:text-gray-400 focus:ring-2 focus:ring-inset focus:ring-indigo-600 sm:text-sm sm:leading-6"
                                    placeholder="018d233e-7906-73f1-8a0c-f76a4fdac34e"
-                                   value="{{ app.request.get('aggregateId') }}">
+                                   value="{{ app.request.query.get('aggregateId') }}">
                         </div>
                     </div>
                 {% endif %}
@@ -73,7 +73,7 @@
                     {{ heroicon('funnel', 'h-6 w-6') }}
                 </button>
 
-                {% if app.request.get('streamName') or app.request.get('aggregate') or app.request.get('aggregateId') %}
+                {% if app.request.query.get('streamName') or app.request.query.get('aggregate') or app.request.query.get('aggregateId') %}
                     <a class="rounded-md bg-red-600 px-2.5 py-1.5 font-semibold text-white shadow-sm hover:bg-red-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-red-600"
                        href="{{ path('patchlevel_event_sourcing_admin_store_show') }}">
                         {{ heroicon('backspace', 'h-6 w-6') }}
diff --git a/templates/subscription/show.html.twig b/templates/subscription/show.html.twig
index a57fce8..9c1433a 100644
--- a/templates/subscription/show.html.twig
+++ b/templates/subscription/show.html.twig
@@ -16,7 +16,7 @@
                         <input type="text" name="search" id="search"
                                class="block w-full rounded-md border-0 py-1.5 text-gray-900 shadow-sm ring-1 ring-inset ring-gray-300 placeholder:text-gray-400 focus:ring-2 focus:ring-inset focus:ring-indigo-600 sm:text-sm sm:leading-6"
                                placeholder="Search..."
-                               value="{{ app.request.get('search') }}">
+                               value="{{ app.request.query.get('search') }}">
                     </div>
                 </div>
 
@@ -24,11 +24,11 @@
                     <label for="group" class="block text-xs font-medium leading-6 text-gray-900">Group</label>
                     <select id="group" name="group"
                             class="mt-1 block w-full rounded-md border-0 py-1.5 pl-3 pr-10 text-gray-900 ring-1 ring-inset ring-gray-300 focus:ring-2 focus:ring-indigo-600 sm:text-sm sm:leading-6">
-                        <option {% if app.request.get('group') == "" %}selected{% endif %}
+                        <option {% if app.request.query.get('group') == "" %}selected{% endif %}
                                 value="">-- choose --
                         </option>
                         {% for group in groups|default([]) %}
-                            <option {% if app.request.get('group') == group %}selected{% endif %}
+                            <option {% if app.request.query.get('group') == group %}selected{% endif %}
                                     value="{{ group }}">{{ group }}</option>
                         {% endfor %}
                     </select>
@@ -39,11 +39,11 @@
                     <label for="mode" class="block text-xs font-medium leading-6 text-gray-900">Run mode</label>
                     <select id="mode" name="mode"
                             class="mt-1 block w-full rounded-md border-0 py-1.5 pl-3 pr-10 text-gray-900 ring-1 ring-inset ring-gray-300 focus:ring-2 focus:ring-indigo-600 sm:text-sm sm:leading-6">
-                        <option {% if app.request.get('mode') == "" %}selected{% endif %}
+                        <option {% if app.request.query.get('mode') == "" %}selected{% endif %}
                                 value="">-- choose --
                         </option>
                         {% for mode in modes|default([]) %}
-                            <option {% if app.request.get('mode') == mode %}selected{% endif %}
+                            <option {% if app.request.query.get('mode') == mode %}selected{% endif %}
                                     value="{{ mode }}">{{ mode|replace({'_': ' '}) }}</option>
                         {% endfor %}
                     </select>
@@ -54,11 +54,11 @@
                     <label for="status" class="block text-xs font-medium leading-6 text-gray-900">Status</label>
                     <select id="status" name="status"
                             class="mt-1 block w-full rounded-md border-0 py-1.5 pl-3 pr-10 text-gray-900 ring-1 ring-inset ring-gray-300 focus:ring-2 focus:ring-indigo-600 sm:text-sm sm:leading-6">
-                        <option {% if app.request.get('status') == "" %}selected{% endif %}
+                        <option {% if app.request.query.get('status') == "" %}selected{% endif %}
                                 value="">-- choose --
                         </option>
                         {% for status in statuses|default([]) %}
-                            <option {% if app.request.get('status') == status %}selected{% endif %}
+                            <option {% if app.request.query.get('status') == status %}selected{% endif %}
                                     value="{{ status }}">{{ status }}</option>
                         {% endfor %}
                     </select>
@@ -69,7 +69,7 @@
                     {{ heroicon('funnel', 'h-6 w-6') }}
                 </button>
 
-                {% if app.request.get('search') or app.request.get('group') or app.request.get('mode') or app.request.get('status') %}
+                {% if app.request.query.get('search') or app.request.query.get('group') or app.request.query.get('mode') or app.request.query.get('status') %}
                     <a class="rounded-md bg-red-600 px-2.5 py-1.5 font-semibold text-white shadow-sm hover:bg-red-500 focus-visible:outline focus-visible:outline-2 focus-visible:outline-offset-2 focus-visible:outline-red-600"
                        href="{{ path('patchlevel_event_sourcing_admin_subscription_show') }}">
                         {{ heroicon('backspace', 'h-6 w-6') }}