diff --git a/templates/admin/project_admin.html.twig b/templates/admin/project_admin.html.twig
index aafb364d..7c4418a7 100644
--- a/templates/admin/project_admin.html.twig
+++ b/templates/admin/project_admin.html.twig
@@ -36,7 +36,7 @@
                 {% if entity.buildPart %}
                     <span class="form-control-static"><a href="{{ entity_url(entity.buildPart) }}">{{ entity.buildPart.name }}</a></span>
                 {% else %}
-                    <a href="{{ path('part_new_build_part', {"project_id": entity.id , "_redirect":  app.request.baseUrl ~ app.request.requestUri}) }}"
+                    <a href="{{ path('part_new_build_part', {"project_id": entity.id , "_redirect":  app.request.baseUrl ~ app.request.pathInfo}) }}"
                        class="btn btn-outline-success">{% trans %}project.edit.associated_build_part.add{% endtrans %}</a>
                 {% endif %}
                 <p class="text-muted">{% trans %}project.edit.associated_build.hint{% endtrans %}</p>
diff --git a/templates/components/datatables.macro.html.twig b/templates/components/datatables.macro.html.twig
index 0a35d522..2fbde82b 100644
--- a/templates/components/datatables.macro.html.twig
+++ b/templates/components/datatables.macro.html.twig
@@ -1,5 +1,5 @@
 {% macro datatable(datatable, controller = 'elements/datatables/datatables', state_save_tag = null) %}
-    <div {{ stimulus_controller(controller, {"stateSaveTag": state_save_tag}) }} data-dt-settings='{{ datatable_settings(datatable)|escape('html_attr') }}' data-dt-url="{{ app.request.baseUrl ~ app.request.requestUri }}">
+    <div {{ stimulus_controller(controller, {"stateSaveTag": state_save_tag}) }} data-dt-settings='{{ datatable_settings(datatable)|escape('html_attr') }}' data-dt-url="{{ app.request.baseUrl ~ app.request.pathInfo }}">
         <div {{ stimulus_target(controller, 'dt') }}>
             <div class="card-body">
                 <div class="card">
@@ -20,12 +20,12 @@
 {% macro partsDatatableWithForm(datatable, state_save_tag = 'parts') %}
     <form method="post" action="{{ path("table_action") }}"
           {# The app.request.baseUrl here is important or it wont work behind a reverse proxy with subfolder #}
-            {{ stimulus_controller('elements/datatables/parts', {"stateSaveTag": state_save_tag}) }} data-dt-settings='{{ datatable_settings(datatable)|escape('html_attr') }}' data-dt-url="{{ app.request.baseUrl ~ app.request.requestUri }}"
+            {{ stimulus_controller('elements/datatables/parts', {"stateSaveTag": state_save_tag}) }} data-dt-settings='{{ datatable_settings(datatable)|escape('html_attr') }}' data-dt-url="{{ app.request.baseUrl ~ app.request.pathInfo }}"
             {{ stimulus_action('elements/datatables/parts', 'confirmDeletionAtSubmit') }}  data-delete-title="{% trans %}part_list.action.delete-title{% endtrans %}"
           data-delete-message="{% trans %}part_list.action.delete-message{% endtrans %}">
         <input type="hidden" name="_token" value="{{ csrf_token('table_action') }}">
 
-        <input type="hidden" name="redirect_back" value="{{  app.request.baseUrl ~ app.request.requestUri }}">
+        <input type="hidden" name="redirect_back" value="{{  app.request.baseUrl ~ app.request.pathInfo }}">
 
         <input type="hidden" name="ids" {{ stimulus_target('elements/datatables/parts', 'selectIDs') }} value="">
 
diff --git a/templates/components/history_log_macros.html.twig b/templates/components/history_log_macros.html.twig
index e3da01ab..69610e8b 100644
--- a/templates/components/history_log_macros.html.twig
+++ b/templates/components/history_log_macros.html.twig
@@ -17,7 +17,7 @@
             {{ stimulus_controller('elements/delete_btn') }} {{ stimulus_action('elements/delete_btn', "submit", "submit") }}
           data-delete-title="{% trans %}log.undo.confirm_title{% endtrans %}"
           data-delete-message="{% trans %}log.undo.confirm_message{% endtrans %}">
-        <input type="hidden" name="redirect_back" value="{{  app.request.baseUrl ~ app.request.requestUri }}">
+        <input type="hidden" name="redirect_back" value="{{  app.request.baseUrl ~ app.request.pathInfo }}">
 
         {{ datatables.logDataTable(datatable, tag) }}
     </form>
diff --git a/templates/log_system/details/helper.macro.html.twig b/templates/log_system/details/helper.macro.html.twig
index 4d8c893f..95f2ab0a 100644
--- a/templates/log_system/details/helper.macro.html.twig
+++ b/templates/log_system/details/helper.macro.html.twig
@@ -22,7 +22,7 @@
           data-delete-title="{% trans %}log.undo.confirm_title{% endtrans %}"
           data-delete-message="{% trans %}log.undo.confirm_message{% endtrans %}">
 
-        <input type="hidden" name="redirect_back" value="{{ app.request.baseUrl ~ app.request.requestUri }}">
+        <input type="hidden" name="redirect_back" value="{{ app.request.baseUrl ~ app.request.pathInfo }}">
 
         <div class="btn-group btn-group-sm" role="group">
             <button type="submit" class="btn btn-outline-secondary" name="undo" value="{{ entry.id }}" {% if disabled %}disabled{% endif %}>
diff --git a/templates/parts/info/_merge_modal.html.twig b/templates/parts/info/_merge_modal.html.twig
index cbf103e1..eb4ca35a 100644
--- a/templates/parts/info/_merge_modal.html.twig
+++ b/templates/parts/info/_merge_modal.html.twig
@@ -17,7 +17,7 @@
             <div class="modal-body">
                 {# non visible form elements #}
                 <input type="hidden" name="lot_id" value="">
-                <input type="hidden" name="_redirect" value="{{  app.request.baseUrl ~ app.request.requestUri }}">
+                <input type="hidden" name="_redirect" value="{{  app.request.baseUrl ~ app.request.pathInfo }}">
 
                 <div class="row mb-2">
                     <label class="form-label">
diff --git a/templates/parts/info/_projects.html.twig b/templates/parts/info/_projects.html.twig
index 3d3e7689..2993d5aa 100644
--- a/templates/parts/info/_projects.html.twig
+++ b/templates/parts/info/_projects.html.twig
@@ -29,7 +29,7 @@
 </table>
 
 <a class="btn btn-success" {% if not is_granted('@projects.edit') %}disabled{% endif %}
-   href="{{ path('project_add_parts_no_id', {"parts": part.id, "_redirect":  app.request.baseUrl ~ app.request.requestUri}) }}">
+   href="{{ path('project_add_parts_no_id', {"parts": part.id, "_redirect":  app.request.baseUrl ~ app.request.pathInfo}) }}">
     <i class="fa-solid fa-magnifying-glass-plus fa-fw"></i>
     {% trans %}part.info.add_part_to_project{% endtrans %}
 </a>
\ No newline at end of file
diff --git a/templates/parts/info/_tools.html.twig b/templates/parts/info/_tools.html.twig
index 1a2c2a8f..7d1c0019 100644
--- a/templates/parts/info/_tools.html.twig
+++ b/templates/parts/info/_tools.html.twig
@@ -69,7 +69,7 @@
 {{ dropdown.profile_dropdown('part', part.id) }}
 
 <a class="btn btn-success mt-2" {% if not is_granted('@projects.edit') %}disabled{% endif %}
-   href="{{ path('project_add_parts_no_id', {"parts": part.id, "_redirect":  app.request.baseUrl ~ app.request.requestUri}) }}">
+   href="{{ path('project_add_parts_no_id', {"parts": part.id, "_redirect":  app.request.baseUrl ~ app.request.pathInfo}) }}">
     <i class="fa-solid fa-magnifying-glass-plus fa-fw"></i>
     {% trans %}part.info.add_part_to_project{% endtrans %}
 </a>
\ No newline at end of file
diff --git a/templates/parts/info/_withdraw_modal.html.twig b/templates/parts/info/_withdraw_modal.html.twig
index fae6a8e8..b4d8549f 100644
--- a/templates/parts/info/_withdraw_modal.html.twig
+++ b/templates/parts/info/_withdraw_modal.html.twig
@@ -15,7 +15,7 @@
                     <input type="hidden" name="lot_id" value="">
                     <input type="hidden" name="action" value="">
                     <input type="hidden" name="_csfr" value="{{ csrf_token('part_withraw' ~ part.iD) }}">
-                    <input type="hidden" name="_redirect" value="{{  app.request.baseUrl ~ app.request.requestUri }}">
+                    <input type="hidden" name="_redirect" value="{{  app.request.baseUrl ~ app.request.pathInfo }}">
 
                     <div class="row mb-2">
                         <label class="col-form-label col-sm-3">
diff --git a/templates/projects/info/_bom.html.twig b/templates/projects/info/_bom.html.twig
index 1beb3331..16c51a01 100644
--- a/templates/projects/info/_bom.html.twig
+++ b/templates/projects/info/_bom.html.twig
@@ -2,7 +2,7 @@
 
 <div class="btn-group mb-2 mt-2">
     <a class="btn btn-success" {% if not is_granted('@projects.edit') %}disabled{% endif %}
-       href="{{ path('project_add_parts', {"id": project.id, "_redirect":  app.request.baseUrl ~ app.request.requestUri}) }}">
+       href="{{ path('project_add_parts', {"id": project.id, "_redirect":  app.request.baseUrl ~ app.request.pathInfo}) }}">
         <i class="fa-solid fa-square-plus fa-fw"></i>
         {% trans %}project.info.bom_add_parts{% endtrans %}
     </a>
diff --git a/templates/projects/info/_builds.html.twig b/templates/projects/info/_builds.html.twig
index bdf3b59b..d87b61bb 100644
--- a/templates/projects/info/_builds.html.twig
+++ b/templates/projects/info/_builds.html.twig
@@ -28,7 +28,7 @@
         <div class="col-4">
             <div class="input-group mb-3">
                 <input type="number" min="1" class="form-control" placeholder="{% trans %}project.builds.number_of_builds{% endtrans %}" name="n" required>
-                <input type="hidden" name="_redirect" value="{{  app.request.baseUrl ~ app.request.requestUri }}">
+                <input type="hidden" name="_redirect" value="{{  app.request.baseUrl ~ app.request.pathInfo }}">
                 <button class="btn btn-outline-secondary" type="submit" id="button-addon2">{% trans %}project.build.btn_build{% endtrans %}</button>
             </div>
         </div>