diff --git a/dbd/qq/SYS_SAIMOD_LOG_FILTER.php b/dbd/qq/SYS_SAIMOD_LOG_FILTER.php
index fc8ddf1..d3a4d77 100644
--- a/dbd/qq/SYS_SAIMOD_LOG_FILTER.php
+++ b/dbd/qq/SYS_SAIMOD_LOG_FILTER.php
@@ -10,7 +10,7 @@ class SYS_SAIMOD_LOG_FILTER extends \SYSTEM\DB\QP {
 ' ON '.\SYSTEM\DBD\system_log::NAME_PG.'.'.\SYSTEM\DBD\system_log::FIELD_USER.
 ' = '.\SYSTEM\DBD\system_user::NAME_PG.'.'.\SYSTEM\DBD\system_user::FIELD_ID.
 ' WHERE '.\SYSTEM\DBD\system_log::FIELD_CLASS.' LIKE $1'.
-' ORDER BY '.\SYSTEM\DBD\system_log::FIELD_TIME.' DESC, '.\SYSTEM\DBD\system_log::NAME_PG.'.'.\SYSTEM\DBD\system_log::FIELD_ID.' DESC LIMIT 100;',
+' ORDER BY '.\SYSTEM\DBD\system_log::FIELD_TIME.' DESC, '.\SYSTEM\DBD\system_log::NAME_PG.'."'.\SYSTEM\DBD\system_log::FIELD_ID.'" DESC LIMIT 100;',
 //mys
 'SELECT * FROM '.\SYSTEM\DBD\system_log::NAME_MYS.
 ' LEFT JOIN '.\SYSTEM\DBD\system_user::NAME_MYS.
diff --git a/dbd/qq/SYS_SAIMOD_SECURITY_RIGHT_CHECK.php b/dbd/qq/SYS_SAIMOD_SECURITY_RIGHT_CHECK.php
index 882e61e..bbaa5ad 100644
--- a/dbd/qq/SYS_SAIMOD_SECURITY_RIGHT_CHECK.php
+++ b/dbd/qq/SYS_SAIMOD_SECURITY_RIGHT_CHECK.php
@@ -5,7 +5,8 @@ class SYS_SAIMOD_SECURITY_RIGHT_CHECK extends \SYSTEM\DB\QP {
     protected static function query(){
         return new \SYSTEM\DB\QQuery(get_class(),
 //pg            
-'',
+'SELECT * FROM system.rights'.
+' WHERE "ID" = $1;',
 //mys
 'SELECT * FROM system_rights'.
 ' WHERE ID = ?;'
diff --git a/dbd/qq/SYS_SAIMOD_SECURITY_RIGHT_DELETE.php b/dbd/qq/SYS_SAIMOD_SECURITY_RIGHT_DELETE.php
index 751af4d..6873458 100644
--- a/dbd/qq/SYS_SAIMOD_SECURITY_RIGHT_DELETE.php
+++ b/dbd/qq/SYS_SAIMOD_SECURITY_RIGHT_DELETE.php
@@ -5,7 +5,8 @@ class SYS_SAIMOD_SECURITY_RIGHT_DELETE extends \SYSTEM\DB\QP {
     protected static function query(){
         return new \SYSTEM\DB\QQuery(get_class(),
 //pg            
-'',
+'DELETE FROM system.rights'.
+' WHERE "ID" = $1;',
 //mys
 'DELETE FROM system_rights'.
 ' WHERE ID = ?;'
diff --git a/dbd/qq/SYS_SAIMOD_SECURITY_RIGHT_INSERT.php b/dbd/qq/SYS_SAIMOD_SECURITY_RIGHT_INSERT.php
index 4d3c0f4..c1997d9 100644
--- a/dbd/qq/SYS_SAIMOD_SECURITY_RIGHT_INSERT.php
+++ b/dbd/qq/SYS_SAIMOD_SECURITY_RIGHT_INSERT.php
@@ -5,7 +5,8 @@ class SYS_SAIMOD_SECURITY_RIGHT_INSERT extends \SYSTEM\DB\QP {
     protected static function query(){
         return new \SYSTEM\DB\QQuery(get_class(),
 //pg            
-'',
+'INSERT INTO system.rights ("ID", name, description)'.
+' VALUES($1, $2, $3);',
 //mys
 'INSERT IGNORE INTO system_rights (ID, name, description)'.
 ' VALUES(?, ?, ?);'
diff --git a/dbd/qq/SYS_SAIMOD_SECURITY_USER_LOG.php b/dbd/qq/SYS_SAIMOD_SECURITY_USER_LOG.php
index 6f9881d..76fde89 100644
--- a/dbd/qq/SYS_SAIMOD_SECURITY_USER_LOG.php
+++ b/dbd/qq/SYS_SAIMOD_SECURITY_USER_LOG.php
@@ -8,8 +8,8 @@ class SYS_SAIMOD_SECURITY_USER_LOG extends \SYSTEM\DB\QP {
 'SELECT * FROM '.\SYSTEM\DBD\system_log::NAME_PG.
 ' LEFT JOIN '.\SYSTEM\DBD\system_user::NAME_PG.
 ' ON '.\SYSTEM\DBD\system_log::NAME_PG.'.'.\SYSTEM\DBD\system_log::FIELD_USER.
-' = '.\SYSTEM\DBD\system_user::NAME_PG.'.'.\SYSTEM\DBD\system_user::FIELD_ID.
-' WHERE '.\SYSTEM\DBD\system_log::FIELD_USER.' = $1'.
+' = '.\SYSTEM\DBD\system_user::NAME_PG.'."'.\SYSTEM\DBD\system_user::FIELD_ID.'"'.
+' WHERE "'.\SYSTEM\DBD\system_log::FIELD_USER.'" = $1'.
 ' ORDER BY '.\SYSTEM\DBD\system_log::FIELD_TIME.' DESC LIMIT 100;',
 //mys
 'SELECT * FROM '.\SYSTEM\DBD\system_log::NAME_MYS.
diff --git a/dbd/qq/SYS_SAIMOD_SECURITY_USER_LOG_COUNT.php b/dbd/qq/SYS_SAIMOD_SECURITY_USER_LOG_COUNT.php
index 1406ef8..9343a0f 100644
--- a/dbd/qq/SYS_SAIMOD_SECURITY_USER_LOG_COUNT.php
+++ b/dbd/qq/SYS_SAIMOD_SECURITY_USER_LOG_COUNT.php
@@ -6,7 +6,7 @@ class SYS_SAIMOD_SECURITY_USER_LOG_COUNT extends \SYSTEM\DB\QP {
         return new \SYSTEM\DB\QQuery(get_class(),
 //pg            
 'SELECT COUNT(*) as count FROM '.\SYSTEM\DBD\system_log::NAME_PG.
-' WHERE '.\SYSTEM\DBD\system_log::FIELD_USER.
+' WHERE "'.\SYSTEM\DBD\system_log::FIELD_USER.'"'.
 ' = $1;',
 //mys
 'SELECT COUNT(*) as count'.
diff --git a/dbd/qq/SYS_SAIMOD_SECURITY_USER_RIGHTS.php b/dbd/qq/SYS_SAIMOD_SECURITY_USER_RIGHTS.php
index 98ff612..a38f6bf 100644
--- a/dbd/qq/SYS_SAIMOD_SECURITY_USER_RIGHTS.php
+++ b/dbd/qq/SYS_SAIMOD_SECURITY_USER_RIGHTS.php
@@ -5,7 +5,7 @@ class SYS_SAIMOD_SECURITY_USER_RIGHTS extends \SYSTEM\DB\QP {
     protected static function query(){
         return new \SYSTEM\DB\QQuery(get_class(),
 //pg            
-'',
+'SELECT * FROM system.rights LEFT JOIN system.user_to_rights ON system.rights."ID" = system.user_to_rights."rightID" WHERE system.user_to_rights."userID" = $1 ORDER BY system.rights."ID" ASC;',
 //mys
 'SELECT * FROM system_rights LEFT JOIN system_user_to_rights ON system_rights.id = system_user_to_rights.rightID WHERE system_user_to_rights.userID = ? ORDER BY system_rights.id ASC;'
 );}}
diff --git a/dbd/qq/SYS_SAIMOD_SECURITY_USER_RIGHT_CHECK.php b/dbd/qq/SYS_SAIMOD_SECURITY_USER_RIGHT_CHECK.php
index 33278da..1d83303 100644
--- a/dbd/qq/SYS_SAIMOD_SECURITY_USER_RIGHT_CHECK.php
+++ b/dbd/qq/SYS_SAIMOD_SECURITY_USER_RIGHT_CHECK.php
@@ -5,7 +5,7 @@ class SYS_SAIMOD_SECURITY_USER_RIGHT_CHECK extends \SYSTEM\DB\QP {
     protected static function query(){
         return new \SYSTEM\DB\QQuery(get_class(),
 //pg            
-'',
+'SELECT COUNT(*) as count FROM system.user_to_rights WHERE "rightID" = $1 AND "userID" = $2 LIMIT 1;',
 //mys
 'SELECT COUNT(*) as count FROM system_user_to_rights WHERE rightID = ? AND userID = ? LIMIT 1;'
 );}}
diff --git a/dbd/qq/SYS_SAIMOD_SECURITY_USER_RIGHT_DELETE.php b/dbd/qq/SYS_SAIMOD_SECURITY_USER_RIGHT_DELETE.php
index e617726..0550f77 100644
--- a/dbd/qq/SYS_SAIMOD_SECURITY_USER_RIGHT_DELETE.php
+++ b/dbd/qq/SYS_SAIMOD_SECURITY_USER_RIGHT_DELETE.php
@@ -5,7 +5,7 @@ class SYS_SAIMOD_SECURITY_USER_RIGHT_DELETE extends \SYSTEM\DB\QP {
     protected static function query(){
         return new \SYSTEM\DB\QQuery(get_class(),
 //pg            
-'',
+'DELETE FROM system.user_to_rights WHERE "rightID" = $1 and "userID" = $2;',
 //mys
 'DELETE FROM system_user_to_rights WHERE rightID = ? and userID = ?;'
 );}}
diff --git a/dbd/qq/SYS_SAIMOD_SECURITY_USER_RIGHT_INSERT.php b/dbd/qq/SYS_SAIMOD_SECURITY_USER_RIGHT_INSERT.php
index f075a14..08bf98f 100644
--- a/dbd/qq/SYS_SAIMOD_SECURITY_USER_RIGHT_INSERT.php
+++ b/dbd/qq/SYS_SAIMOD_SECURITY_USER_RIGHT_INSERT.php
@@ -5,7 +5,7 @@ class SYS_SAIMOD_SECURITY_USER_RIGHT_INSERT extends \SYSTEM\DB\QP {
     protected static function query(){
         return new \SYSTEM\DB\QQuery(get_class(),
 //pg            
-'',
+'INSERT INTO system.user_to_rights ("rightID", "userID") VALUES($1, $2);',
 //mys
 'INSERT INTO system_user_to_rights (rightID, userID) VALUES(?, ?);'
 );}}
diff --git a/sai/modules/saimod_sys_security/saimod_sys_security.php b/sai/modules/saimod_sys_security/saimod_sys_security.php
index a05b2cf..dbfb9bf 100644
--- a/sai/modules/saimod_sys_security/saimod_sys_security.php
+++ b/sai/modules/saimod_sys_security/saimod_sys_security.php
@@ -15,8 +15,8 @@ class saimod_sys_security extends \SYSTEM\SAI\SaiModule {
         $res = \SYSTEM\DBD\SYS_SAIMOD_SECURITY_RIGHTS::QQ();                
         while($r = $res->next()){
             $r['right_edit_btn'] =  \SYSTEM\SECURITY\Security::check(\SYSTEM\SECURITY\RIGHTS::SYS_SAI_SECURITY_RIGHTS_EDIT) ?
-                                    '<input type="submit" class="btn-danger right_delete" value="delete" right_id="${ID}">
-                                    <input type="submit" class="btn right_edit" value="edit" right_id="${ID}">' :
+                                    '<input type="submit" class="btn-danger right_delete" value="delete" right_id="'.$r['ID'].'">
+                                    <input type="submit" class="btn right_edit" value="edit" right_id="'.$r['ID'].'">' :
                                     '<font color="red">Missing rights.</font>';
             $rows .= \SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new \SYSTEM\PSAI(),'modules/saimod_sys_security/saimod_sys_security_right.tpl'),$r);}        
         $vars['rows'] = $rows;