diff --git a/libraries/db_events.inc.php b/libraries/db_events.inc.php
index a18bafc663..9304135eb9 100644
--- a/libraries/db_events.inc.php
+++ b/libraries/db_events.inc.php
@@ -109,7 +109,7 @@ if ($es_state === 'ON' || $es_state === 'OFF') {
     $tableStart = '<table style="width: 100%"><tr><td style="width: 50%;">';
     $schedulerFieldset = '</td><td><fieldset>' . "\n"
        . PMA_getIcon('b_events.png') . __('The event scheduler is ') . $es_state . ':'
-       . '    <a href="db_events.php?' . $GLOBALS['url_query'] . '&amp;toggle_scheduler=' . $es_change . '">'
+       . '    <a href="db_events.php?' . $url_query . '&amp;toggle_scheduler=' . $es_change . '">'
        . __('Turn') . " $es_change\n" .  '</a>' . "\n"
        . '</fieldset></td></tr></table>' . "\n";
 }
@@ -118,7 +118,7 @@ if ($es_state === 'ON' || $es_state === 'OFF') {
  * Display the form for adding a new event
  */
 echo $tableStart . '<fieldset>' . "\n"
-   . '    <a href="db_events.php?' . $GLOBALS['url_query'] . '&amp;addevent=1" ' . $conditional_class_add . '>' . "\n"
+   . '    <a href="db_events.php?' . $url_query . '&amp;addevent=1" ' . $conditional_class_add . '>' . "\n"
    . PMA_getIcon('b_event_add.png') . __('Add a new Event') . '</a>' . "\n"
    . '</fieldset>' . "\n";
 
diff --git a/libraries/db_routines.inc.php b/libraries/db_routines.inc.php
index 89b01af0bb..e538a1eebf 100644
--- a/libraries/db_routines.inc.php
+++ b/libraries/db_routines.inc.php
@@ -133,7 +133,7 @@ echo '</fieldset>' . "\n";
  * Display the form for adding a new routine
  */
 echo '<fieldset>' . "\n"
-   . '    <a href="db_routines.php?' . $GLOBALS['url_query'] . '&amp;addroutine=1" class="' . $conditional_class_add . '">' . "\n"
+   . '    <a href="db_routines.php?' . $url_query . '&amp;addroutine=1" class="' . $conditional_class_add . '">' . "\n"
    . PMA_getIcon('b_routine_add.png') . __('Add a new Routine') . '</a>' . "\n"
    . '</fieldset>' . "\n";
 
diff --git a/libraries/display_triggers.inc.php b/libraries/display_triggers.inc.php
index 6f538486ee..8df8252eed 100644
--- a/libraries/display_triggers.inc.php
+++ b/libraries/display_triggers.inc.php
@@ -99,7 +99,7 @@ echo '</fieldset>';
  */
 if (! empty($table)) {
     echo '<fieldset>' . "\n"
-       . '    <a href="tbl_triggers.php?' . $GLOBALS['url_query'] . '&amp;addtrigger=1" class="' . $conditional_class_add . '">' . "\n"
+       . '    <a href="tbl_triggers.php?' . $url_query . '&amp;addtrigger=1" class="' . $conditional_class_add . '">' . "\n"
        . PMA_getIcon('b_trigger_add.png') . __('Add a new Trigger') . '</a>' . "\n"
        . '</fieldset>' . "\n";
 }