diff --git a/admin/Masmak/admin_footer.html b/admin/Masmak/admin_footer.html
index 84a81a3..8b7f3e6 100755
--- a/admin/Masmak/admin_footer.html
+++ b/admin/Masmak/admin_footer.html
@@ -232,6 +232,8 @@ function get_kleeja_link(link) {
 }
 </script>
 
+<IF ISSET="extra_admin_footer_code">
 {extra_admin_footer_code}
+</IF>
 </body>
 </html>
diff --git a/admin/Masmak/admin_header.html b/admin/Masmak/admin_header.html
index ddef605..9ac93f4 100755
--- a/admin/Masmak/admin_header.html
+++ b/admin/Masmak/admin_header.html
@@ -43,7 +43,9 @@
         var STYLE_PATH_ADMIN = '{STYLE_PATH_ADMIN}';
         var go_to = '{go_to}';
     </script>
+<IF ISSET="extra_admin_header_code">
 {extra_admin_header_code}
+</IF>
 </head>
 
 <body class="fixed-nav sticky-footer bg-{admin_theme_color}" id="page-top">
@@ -75,7 +77,7 @@
 
             <LOOP NAME="adm_extensions_menu">
                 <li class="nav-item ({{current}}?activex:)" id="menu_item{{i}}" data-toggle="tooltip" data-placement="right" title="{{title}}">
-                    <a class="first-level nav-link<IF LOOP="current"><IF NAME="go_menu_html"> nav-link-collapse</IF></IF>"  title="{{title}}" href="{{link}}"<IF LOOP="confirm"> onclick="return confirm_form();"</IF>>
+                    <a class="first-level nav-link<IF LOOP="current"><IF ISSET="go_menu_html"> nav-link-collapse</IF></IF>"  title="{{title}}" href="{{link}}"<IF LOOP="confirm"> onclick="return confirm_form();"</IF>>
                         <i class="fa fa-fw fa-{{icon}}"></i> {{title}} {{bubble}}
                     </a>
                     <IF ISSET="go_menu_html">
diff --git a/admin/Masmak/admin_users.html b/admin/Masmak/admin_users.html
index 88c9653..acdf8c3 100755
--- a/admin/Masmak/admin_users.html
+++ b/admin/Masmak/admin_users.html
@@ -254,7 +254,7 @@
 </IF>
 
 
-<IF NAME="GE_INFO">
+<IF ISSET="GE_INFO">
     <script type="text/javascript">
         setTimeout(function() {
             $('.infoexts').fadeOut('fast');
diff --git a/includes/adm/g_users.php b/includes/adm/g_users.php
index b11f737..caab7d7 100755
--- a/includes/adm/g_users.php
+++ b/includes/adm/g_users.php
@@ -818,7 +818,7 @@ case 'group_data':
     $gdata        = $d_groups[$req_group]['data'];
 
     $query = [
-        'SELECT'         => 'c.name, c.option',
+        'SELECT'         => 'c.name, c.option, c.value',
         'FROM'           => "{$dbprefix}config c",
         'WHERE'          => "c.type='groups'",
         'ORDER BY'       => 'c.display_order ASC'
@@ -852,6 +852,8 @@ case 'group_data':
 
         if ($row['name'] == 'language')
         {
+            $lngfiles = '';
+
             //get languages
             if ($dh = @opendir(PATH . 'lang'))
             {
diff --git a/includes/adm/r_repair.php b/includes/adm/r_repair.php
index 73355f2..1886c2d 100755
--- a/includes/adm/r_repair.php
+++ b/includes/adm/r_repair.php
@@ -40,6 +40,9 @@ if ($case && in_array($case, ['clearc', 'sync_files', 'sync_images', 'sync_users
     }
 }
 
+$text      = '';
+
+
 switch ($case):
 
 default:
@@ -73,7 +76,6 @@ case 'tables':
 
 $query     = 'SHOW TABLE STATUS';
 $result    = $SQL->query($query);
-$text      = '';
 
 while ($row=$SQL->fetch_array($result))
 {
diff --git a/includes/functions.php b/includes/functions.php
index 5c87041..04f5d0f 100755
--- a/includes/functions.php
+++ b/includes/functions.php
@@ -1156,7 +1156,7 @@ function klj_clean_old($table, $for = 'all')
 
     $query = [
         'SELECT'         => 'f.id, f.time',
-        'DELETE'         => "`{$dbprefix}" . $table . '` f',
+        'FROM'         => "`{$dbprefix}" . $table . '` f',
         'ORDER BY'       => 'f.id ASC',
         'LIMIT'          => '30',
     ];
diff --git a/includes/mysqli.php b/includes/mysqli.php
index d251a33..bcc00ab 100755
--- a/includes/mysqli.php
+++ b/includes/mysqli.php
@@ -98,7 +98,7 @@ class KleejaDatabase
             //loggin -> close connection
             kleeja_log('[Closing connection] : ' . kleeja_get_page());
 
-            if(! $this->connect_id)
+            if(! is_resource($this->connect_id))
             {
                 return true;
             }
@@ -225,7 +225,7 @@ class KleejaDatabase
     {
         $sql = '';
 
-        if (isset($query['SELECT']))
+        if (isset($query['SELECT']) && isset($query['FROM']))
         {
             $sql = 'SELECT ' . $query['SELECT'] . ' FROM ' . $query['FROM'];
 
