diff --git a/templates/Form/FilterTypesLayout.html.twig b/templates/Form/FilterTypesLayout.html.twig
index 2be7e55c..70927d57 100644
--- a/templates/Form/FilterTypesLayout.html.twig
+++ b/templates/Form/FilterTypesLayout.html.twig
@@ -46,7 +46,7 @@
 
 {% block parameter_constraint_widget %}
     {% import 'components/collection_type.macro.html.twig' as collection %}
-    <tr {{ stimulus_controller('pages/parameters_autocomplete', {"url": url('typeahead_parameters', {"query": "__QUERY__", "type": "part"}) }) }} >
+    <tr {{ stimulus_controller('pages/parameters_autocomplete', {"url": path('typeahead_parameters', {"query": "__QUERY__", "type": "part"}) }) }} >
         <td class="col-sm-2">{{ form_widget(form.name, {"attr": {"data-pages--parameters-autocomplete-target": "name"}}) }}</td>
         <td {{ stimulus_controller('pages/latex_preview') }}>{{ form_widget(form.symbol, {"attr": {"data-pages--parameters-autocomplete-target": "symbol", "data-pages--latex-preview-target": "input"}}) }}<span {{ stimulus_target('pages/latex_preview', 'preview') }}></span></td>
         <td>{{ form_widget(form.value) }}</td>
diff --git a/templates/Parts/edit/edit_form_styles.html.twig b/templates/Parts/edit/edit_form_styles.html.twig
index c0e12ed1..2a3567c5 100644
--- a/templates/Parts/edit/edit_form_styles.html.twig
+++ b/templates/Parts/edit/edit_form_styles.html.twig
@@ -67,7 +67,7 @@
 
 {% block parameter_widget %}
     {% import 'components/collection_type.macro.html.twig' as collection %}
-    <tr {{ stimulus_controller('pages/parameters_autocomplete', {"url": url('typeahead_parameters', {"query": "__QUERY__", "type": form.vars["type"]})}) }}>
+    <tr {{ stimulus_controller('pages/parameters_autocomplete', {"url": path('typeahead_parameters', {"query": "__QUERY__", "type": form.vars["type"]})}) }}>
         <td>{{ form_widget(form.name, {"attr": {"data-pages--parameters-autocomplete-target": "name"}}) }}{{ form_errors(form.name) }}</td>
         <td {{ stimulus_controller('pages/latex_preview') }}>{{ form_widget(form.symbol, {"attr": {"data-pages--parameters-autocomplete-target": "symbol", "data-pages--latex-preview-target": "input"}}) }}{{ form_errors(form.symbol) }}<span {{ stimulus_target('pages/latex_preview', 'preview') }}></span></td>
         <td>{{ form_widget(form.value_min) }}{{ form_errors(form.value_min) }}</td>
diff --git a/templates/Parts/info/_projects.html.twig b/templates/Parts/info/_projects.html.twig
index 0538347a..274de3f0 100644
--- a/templates/Parts/info/_projects.html.twig
+++ b/templates/Parts/info/_projects.html.twig
@@ -17,7 +17,7 @@
         {# @var bom_entry App\Entity\Project\ProjectBOMEntry #}
     <tr>
         <td>{% if bom_entry.project.masterPictureAttachment is not null %}{{ attachments.attachment_icon(bom_entry.project.masterPictureAttachment, attachment_manager) }}{% endif %}</td>
-        <td><a href="{{ url('project_info', {'id': bom_entry.project.iD}) }}">{{ bom_entry.project.name }}</a></td> {# Name #}
+        <td><a href="{{ path('project_info', {'id': bom_entry.project.iD}) }}">{{ bom_entry.project.name }}</a></td> {# Name #}
         <td>{{ bom_entry.project.description|format_markdown }}</td> {# Description #}
         <td>{{ bom_entry.quantity | format_amount(part.partUnit) }}</td>
         <td>{% for tag in bom_entry.mountnames|split(',') %}
diff --git a/templates/components/datatables.macro.html.twig b/templates/components/datatables.macro.html.twig
index c65600e7..d6aa19cd 100644
--- a/templates/components/datatables.macro.html.twig
+++ b/templates/components/datatables.macro.html.twig
@@ -24,7 +24,7 @@
           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.uri }}">
+        <input type="hidden" name="redirect_back" value="{{ app.request.requestUri }}">
 
         <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 2911977a..f3481305 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.uri }}">
+        <input type="hidden" name="redirect_back" value="{{ app.request.requestUri }}">
 
         {{ datatables.logDataTable(datatable, tag) }}
     </form>