9 files changed, 9 insertions, 10 deletions
diff --git a/resources/views/admin/modules.phtml b/resources/views/admin/modules.phtml
index 876da7802b..f73cdb07ae 100644
--- a/resources/views/admin/modules.phtml
+++ b/resources/views/admin/modules.phtml
@@ -34,7 +34,6 @@
 <?php endforeach ?>
 
 <form method="post">
-    <input type="hidden" name="route" value="admin-update-module-status">
     <?= csrf_field() ?>
     <table class="table table-bordered table-hover table-sm table-module-administration"
         <?= view('lists/datatables-attributes') ?>
diff --git a/resources/views/admin/site-logs.phtml b/resources/views/admin/site-logs.phtml
index 9a9c8a44ab..bcf40db13d 100644
--- a/resources/views/admin/site-logs.phtml
+++ b/resources/views/admin/site-logs.phtml
@@ -5,8 +5,8 @@
 
 <h1><?= $title ?></h1>
 
-<form method="get" action="<?= e(route('admin-site-logs')) ?>>" class="form" name="logs">
-    <input type="hidden" name="route" value="admin-site-logs" id="route">
+<form method="get" action="<?= e(route('admin-site-logs')) ?>" class="form" name="logs">
+    <input type="hidden" name="route" value="<?= e(route('admin-site-logs')) ?>">
     <input type="hidden" name="action" value="show">
 
     <div class="row">
diff --git a/resources/views/admin/trees-unconnected.phtml b/resources/views/admin/trees-unconnected.phtml
index 0d4ea2e214..d1809374d5 100644
--- a/resources/views/admin/trees-unconnected.phtml
+++ b/resources/views/admin/trees-unconnected.phtml
@@ -19,7 +19,7 @@ use Fisharebest\Webtrees\Tree;
 <h1><?= $title ?></h1>
 
 <form method="get" action="<?= e(route('admin-trees-unconnected')) ?>" class="form-inline">
-    <input type="hidden" name="route" value="admin-trees-unconnected"">
+    <input type="hidden" name="route" value="<?= e(route('admin-trees-unconnected')) ?>">
     <input type="hidden" name="ged" value="<?= e($tree->name()) ?>">
     <?= view('components/checkbox-inline', ['label' => I18N::translate('Include associates'), 'checked' => $associates, 'name' => 'associates']) ?>
     <button type="submit" class="btn btn-primary">
diff --git a/resources/views/admin/upgrade/wizard.phtml b/resources/views/admin/upgrade/wizard.phtml
index 35927169ae..c696f7eee0 100644
--- a/resources/views/admin/upgrade/wizard.phtml
+++ b/resources/views/admin/upgrade/wizard.phtml
@@ -22,7 +22,7 @@
     </p>
 
     <form method="get" action="<?= e(route('upgrade')) ?>" class="form-horizontal">
-        <input type="hidden" name="route" value="upgrade">
+        <input type="hidden" name="route" value="<?= e(route('upgrade')) ?>">
 
         <button type="submit" class="btn btn-primary" name="continue" value="1">
             <?= I18N::translate('continue') ?>
diff --git a/resources/views/edit/add-fact-row.phtml b/resources/views/edit/add-fact-row.phtml
index 3b9c6f8043..f487de6417 100644
--- a/resources/views/edit/add-fact-row.phtml
+++ b/resources/views/edit/add-fact-row.phtml
@@ -9,7 +9,7 @@
     </th>
     <td>
         <form method="get" action="<?= e(route('add-fact')) ?>" onsubmit="if ($('#add-fact').val() === null) {event.preventDefault();}">
-            <input type="hidden" name="route" value="add-fact">
+            <input type="hidden" name="route" value="<?= e(route('add-fact')) ?>">
             <input type="hidden" name="xref" value="<?= e($record->xref()) ?>">
             <input type="hidden" name="ged" value="<?= e($record->tree()->name()) ?>">
             <div class="input-group">
diff --git a/resources/views/layouts/default.phtml b/resources/views/layouts/default.phtml
index 2f131515b4..fb265e9462 100644
--- a/resources/views/layouts/default.phtml
+++ b/resources/views/layouts/default.phtml
@@ -85,7 +85,7 @@ use Psr\Http\Message\ServerRequestInterface;
 
                         <div class="col wt-header-search">
                             <form method="get" action="<?= e(route('search-quick')) ?>" class="wt-header-search-form" role="search">
-                                <input type="hidden" name="route" value="search-quick">
+                                <input type="hidden" name="route" value="<?= e(route('search-quick')) ?>">
                                 <input type="hidden" name="ged" value="<?= e($tree->name()) ?>">
                                 <div class="input-group">
                                     <label class="sr-only" for="quick-search"><?= I18N::translate('Search') ?></label>
diff --git a/resources/views/modules/statistics-chart/custom.phtml b/resources/views/modules/statistics-chart/custom.phtml
index 0858373ca8..55e9bf114a 100644
--- a/resources/views/modules/statistics-chart/custom.phtml
+++ b/resources/views/modules/statistics-chart/custom.phtml
@@ -11,7 +11,7 @@ use Fisharebest\Webtrees\View;
     </h4>
 
     <form method="get" action="<?= e(route('module', ['module' => $module->name(), 'action' => 'CustomChart'])) ?>" id="own-stats-form" class="wt-page-options wt-page-options-statistics">
-        <input type="hidden" name="route" value="<?= e('/module/' . $module->name() . '/CustomChart') ?>">
+        <input type="hidden" name="route" value="<?= e(route('module', ['module' => $module->name(), 'action' => 'CustomChart'])) ?>">
         <input type="hidden" name="ged" value="<?= e($tree->name()) ?>">
         <div class="form-group row">
             <div class="col-sm-2 wt-page-options-label">
diff --git a/resources/views/search-general-page.phtml b/resources/views/search-general-page.phtml
index 954b746ea9..375bf47108 100644
--- a/resources/views/search-general-page.phtml
+++ b/resources/views/search-general-page.phtml
@@ -5,7 +5,7 @@
 </h2>
 
 <form method="get" action="<?= e(route('search-general')) ?>" class="wt-page-options wt-page-options-search hidden-print mb-4" name="searchform">
-    <input type="hidden" name="route" value="search-general">
+    <input type="hidden" name="route" value="<?= e(route('search-general')) ?>">
     <input type="hidden" name="ged" value="<?= e($tree->name()) ?>">
     <div class="row form-group">
         <label class="col-sm-3 col-form-label wt-page-options-label" for="query">
diff --git a/resources/views/search-phonetic-page.phtml b/resources/views/search-phonetic-page.phtml
index 1e9d2f78f9..87e3186702 100644
--- a/resources/views/search-phonetic-page.phtml
+++ b/resources/views/search-phonetic-page.phtml
@@ -5,7 +5,7 @@
 </h2>
 
 <form method="get" action="<?= e(route('search-phonetic')) ?>" class="wt-page-options wt-page-options-ancestors-chart hidden-print mb-4" name="searchform">
-    <input type="hidden" name="route" value="search-phonetic">
+    <input type="hidden" name="route" value="<?= e(route('search-phonetic')) ?>">
     <input type="hidden" name="ged" value="<?= e($tree->name()) ?>">
     <div class="row form-group">
         <label class="col-sm-3 col-form-label wt-page-options-label" for="firstname">