diff --git a/templates/home/index.twig b/templates/home/index.twig
index 498011b740..e0fb63a4d7 100644
--- a/templates/home/index.twig
+++ b/templates/home/index.twig
@@ -15,11 +15,11 @@
         <div class="group">
           <h2>{% trans 'phpMyAdmin Demo Server' %}</h2>
           <p class="cfg_dbg_demo">
-            {% filter format('<a href="url.php?url=https://demo.phpmyadmin.net/" target="_blank" rel="noopener noreferrer">demo.phpmyadmin.net</a>')|raw %}
+            {% apply format('<a href="url.php?url=https://demo.phpmyadmin.net/" target="_blank" rel="noopener noreferrer">demo.phpmyadmin.net</a>')|raw %}
               {% trans %}
                 You are using the demo server. You can do anything here, but please do not change root, debian-sys-maint and pma users. More information is available at %s.
               {% endtrans %}
-            {% endfilter %}
+            {% endapply %}
           </p>
         </div>
       {% endif %}
diff --git a/templates/scripts.twig b/templates/scripts.twig
index 0b0f7c94e1..13a29a3091 100644
--- a/templates/scripts.twig
+++ b/templates/scripts.twig
@@ -13,8 +13,10 @@ AJAX.scriptHandler
 {% endfor %}
 ;
 $(function() {
-{% for file in files if file.has_onload %}
+{% for file in files %}
+  {% if file.has_onload %}
   AJAX.fireOnload('{{ file.filename|escape_js_string }}');
+  {% endif %}
 {% endfor %}
 });
 {% endif %}
diff --git a/templates/server/replication/index.twig b/templates/server/replication/index.twig
index b6ed7316f1..c40df0dda6 100644
--- a/templates/server/replication/index.twig
+++ b/templates/server/replication/index.twig
@@ -12,11 +12,11 @@
     {% elseif master_configure is null and clear_screen is null %}
       <fieldset>
         <legend>{% trans 'Master replication' %}</legend>
-        {% filter format('<a href="server_replication.php" data-post="' ~ get_common(url_params|merge({'mr_configure': true}), '') ~ '">', '</a>')|raw %}
+        {% apply format('<a href="server_replication.php" data-post="' ~ get_common(url_params|merge({'mr_configure': true}), '') ~ '">', '</a>')|raw %}
           {% trans %}
             This server is not configured as master in a replication process. Would you like to %sconfigure%s it?
           {% endtrans %}
-        {% endfilter %}
+        {% endapply %}
       </fieldset>
     {% endif %}
 
diff --git a/templates/server/replication/slave_configuration.twig b/templates/server/replication/slave_configuration.twig
index b205ccfb4a..5b12ea7adf 100644
--- a/templates/server/replication/slave_configuration.twig
+++ b/templates/server/replication/slave_configuration.twig
@@ -99,11 +99,11 @@
       </ul>
     </div>
   {% elseif not has_slave_configure %}
-    {% filter format('<a href="server_replication.php" data-post="' ~ get_common(url_params|merge({
+    {% apply format('<a href="server_replication.php" data-post="' ~ get_common(url_params|merge({
       'sl_configure': true,
       'repl_clear_scr': true
     })) ~ '">', '</a>')|raw %}
       {% trans 'This server is not configured as slave in a replication process. Would you like to %sconfigure%s it?' %}
-    {% endfilter %}
+    {% endapply %}
   {% endif %}
 </fieldset>