diff --git a/ChangeLog b/ChangeLog
index 7b529aec0b..8e06f5e6c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -89,6 +89,9 @@ phpMyAdmin - ChangeLog
 - issue #17920 Fixed moving column with empty default value will replace it with ''
 - issue #18006 Fixed moving columns causes the default uuid() value to get quotes around it
 - issue #18962 Fixed move columns with ENUM() & DEFAULT causes invalid SQL
+- issue #18276 Fix on update CURRENT_TIMESTAMP doesn't show as default in attributes
+- issue #18240 Fix inserting value with UNIX_TIMESTAMP() without a parameter
+- issue #19125 Fixed CodeMirror tooltip is below modals
 
 5.2.1 (2023-02-07)
 - issue #17522 Fix case where the routes cache file is invalid
diff --git a/public/themes/bootstrap/scss/_codemirror.scss b/public/themes/bootstrap/scss/_codemirror.scss
index 1a7b218c53..3b2aca9ca5 100644
--- a/public/themes/bootstrap/scss/_codemirror.scss
+++ b/public/themes/bootstrap/scss/_codemirror.scss
@@ -160,7 +160,7 @@ $textarea-rows: 15;
 }
 
 .CodeMirror-lint-tooltip {
-  z-index: 200;
+  z-index: 2000;
   font-family: inherit;
 
   code {
diff --git a/public/themes/metro/scss/_codemirror.scss b/public/themes/metro/scss/_codemirror.scss
index 1ca2657a11..fcb548a9a2 100644
--- a/public/themes/metro/scss/_codemirror.scss
+++ b/public/themes/metro/scss/_codemirror.scss
@@ -56,3 +56,13 @@ $textarea-rows: 15 !default;
 .CodeMirror-hints {
   z-index: 1999;
 }
+
+.CodeMirror-lint-tooltip {
+  z-index: 2000;
+  font-family: inherit;
+
+  code {
+    font-family: monospace;
+    font-weight: bold;
+  }
+}
diff --git a/public/themes/pmahomme/scss/_codemirror.scss b/public/themes/pmahomme/scss/_codemirror.scss
index cc0381fbe7..3158556559 100644
--- a/public/themes/pmahomme/scss/_codemirror.scss
+++ b/public/themes/pmahomme/scss/_codemirror.scss
@@ -46,7 +46,7 @@ $textarea-rows: 15;
 }
 
 .CodeMirror-lint-tooltip {
-  z-index: 200;
+  z-index: 2000;
   font-family: inherit;
 
   code {
diff --git a/resources/templates/columns_definitions/column_attribute.twig b/resources/templates/columns_definitions/column_attribute.twig
index 12dd0d5358..1081530ff9 100644
--- a/resources/templates/columns_definitions/column_attribute.twig
+++ b/resources/templates/columns_definitions/column_attribute.twig
@@ -2,7 +2,7 @@
     {% set attribute = submit_attribute %}
     {# MariaDB has additional parentheses #}
 {% elseif column_meta['Extra'] is defined
-    and ('on update current_timestamp' in column_meta['Extra'] or 'on update current_timestamp()' in column_meta['Extra']|lower) %}
+    and ('on update current_timestamp' in column_meta['Extra']|lower or 'on update current_timestamp()' in column_meta['Extra']|lower) %}
     {% set attribute = 'on update CURRENT_TIMESTAMP' %}
 {% elseif extracted_columnspec['attribute'] is defined %}
     {% set attribute = extracted_columnspec['attribute'] %}