diff --git a/config/zentaopms.php b/config/zentaopms.php
index 0c6ca4595c..3d0c2b33d5 100644
--- a/config/zentaopms.php
+++ b/config/zentaopms.php
@@ -11,6 +11,8 @@
 */
 
 /* Product common list. */
+$tableEscape = $config->db->driver == 'dm' ? '"' : '`';
+
 $config->productCommonList['zh-cn'][0] = '产品';
 $config->productCommonList['zh-cn'][1] = '项目';
 $config->productCommonList['zh-tw'][0] = '產品';
@@ -246,129 +248,129 @@ $config->openModules[] = 'upgrade';
 $config->openModules[] = 'im';
 
 /* Define the tables. */
-define('TABLE_COMPANY',       '`' . $config->db->prefix . 'company`');
-define('TABLE_DEPT',          '`' . $config->db->prefix . 'dept`');
-define('TABLE_CONFIG',        '`' . $config->db->prefix . 'config`');
-define('TABLE_USER',          '`' . $config->db->prefix . 'user`');
-define('TABLE_TODO',          '`' . $config->db->prefix . 'todo`');
-define('TABLE_GROUP',         '`' . $config->db->prefix . 'group`');
-define('TABLE_GROUPPRIV',     '`' . $config->db->prefix . 'grouppriv`');
-define('TABLE_USERGROUP',     '`' . $config->db->prefix . 'usergroup`');
-define('TABLE_USERQUERY',     '`' . $config->db->prefix . 'userquery`');
-define('TABLE_USERCONTACT',   '`' . $config->db->prefix . 'usercontact`');
-define('TABLE_USERVIEW',      '`' . $config->db->prefix . 'userview`');
+define('TABLE_COMPANY',       $tableEscape . $config->db->prefix . 'company' . $tableEscape);
+define('TABLE_DEPT',          $tableEscape . $config->db->prefix . 'dept' . $tableEscape);
+define('TABLE_CONFIG',        $tableEscape . $config->db->prefix . 'config' . $tableEscape);
+define('TABLE_USER',          $tableEscape . $config->db->prefix . 'user' . $tableEscape);
+define('TABLE_TODO',          $tableEscape . $config->db->prefix . 'todo' . $tableEscape);
+define('TABLE_GROUP',         $tableEscape . $config->db->prefix . 'group' . $tableEscape);
+define('TABLE_GROUPPRIV',     $tableEscape . $config->db->prefix . 'grouppriv' . $tableEscape);
+define('TABLE_USERGROUP',     $tableEscape . $config->db->prefix . 'usergroup' . $tableEscape);
+define('TABLE_USERQUERY',     $tableEscape . $config->db->prefix . 'userquery' . $tableEscape);
+define('TABLE_USERCONTACT',   $tableEscape . $config->db->prefix . 'usercontact' . $tableEscape);
+define('TABLE_USERVIEW',      $tableEscape . $config->db->prefix . 'userview' . $tableEscape);
 
-define('TABLE_BUG',           '`' . $config->db->prefix . 'bug`');
-define('TABLE_CASE',          '`' . $config->db->prefix . 'case`');
-define('TABLE_CASESTEP',      '`' . $config->db->prefix . 'casestep`');
-define('TABLE_TESTTASK',      '`' . $config->db->prefix . 'testtask`');
-define('TABLE_TESTRUN',       '`' . $config->db->prefix . 'testrun`');
-define('TABLE_TESTRESULT',    '`' . $config->db->prefix . 'testresult`');
-define('TABLE_USERTPL',       '`' . $config->db->prefix . 'usertpl`');
-define('TABLE_ZAHOST',        '`' . $config->db->prefix . 'host`');
-define('TABLE_IMAGE',         '`' . $config->db->prefix . 'image`');
-define('TABLE_AUTOMATION',    '`' . $config->db->prefix . 'automation`');
+define('TABLE_BUG',           $tableEscape . $config->db->prefix . 'bug' . $tableEscape);
+define('TABLE_CASE',          $tableEscape . $config->db->prefix . 'case' . $tableEscape);
+define('TABLE_CASESTEP',      $tableEscape . $config->db->prefix . 'casestep' . $tableEscape);
+define('TABLE_TESTTASK',      $tableEscape . $config->db->prefix . 'testtask' . $tableEscape);
+define('TABLE_TESTRUN',       $tableEscape . $config->db->prefix . 'testrun' . $tableEscape);
+define('TABLE_TESTRESULT',    $tableEscape . $config->db->prefix . 'testresult' . $tableEscape);
+define('TABLE_USERTPL',       $tableEscape . $config->db->prefix . 'usertpl' . $tableEscape);
+define('TABLE_ZAHOST',        $tableEscape . $config->db->prefix . 'host' . $tableEscape);
+define('TABLE_IMAGE',         $tableEscape . $config->db->prefix . 'image' . $tableEscape);
+define('TABLE_AUTOMATION',    $tableEscape . $config->db->prefix . 'automation' . $tableEscape);
 
-if(!defined('TABLE_ASSET'))  define('TABLE_ASSET', '`' . $config->db->prefix . 'asset`');
+if(!defined('TABLE_ASSET'))  define('TABLE_ASSET', $tableEscape . $config->db->prefix . 'asset' . $tableEscape);
 
-define('TABLE_PRODUCT',       '`' . $config->db->prefix . 'product`');
-define('TABLE_BRANCH',        '`' . $config->db->prefix . 'branch`');
-define('TABLE_EXPECT',        '`' . $config->db->prefix . 'expect`');
-define('TABLE_STAGE',         '`' . $config->db->prefix . 'stage`');
-define('TABLE_STAKEHOLDER',   '`' . $config->db->prefix . 'stakeholder`');
-define('TABLE_STORY',         '`' . $config->db->prefix . 'story`');
-define('TABLE_STORYSPEC',     '`' . $config->db->prefix . 'storyspec`');
-define('TABLE_STORYREVIEW',   '`' . $config->db->prefix . 'storyreview`');
-define('TABLE_STORYSTAGE',    '`' . $config->db->prefix . 'storystage`');
-define('TABLE_STORYESTIMATE', '`' . $config->db->prefix . 'storyestimate`');
-define('TABLE_PRODUCTPLAN',   '`' . $config->db->prefix . 'productplan`');
-define('TABLE_PLANSTORY',     '`' . $config->db->prefix . 'planstory`');
-define('TABLE_RELEASE',       '`' . $config->db->prefix . 'release`');
+define('TABLE_PRODUCT',       $tableEscape . $config->db->prefix . 'product' . $tableEscape);
+define('TABLE_BRANCH',        $tableEscape . $config->db->prefix . 'branch' . $tableEscape);
+define('TABLE_EXPECT',        $tableEscape . $config->db->prefix . 'expect' . $tableEscape);
+define('TABLE_STAGE',         $tableEscape . $config->db->prefix . 'stage' . $tableEscape);
+define('TABLE_STAKEHOLDER',   $tableEscape . $config->db->prefix . 'stakeholder' . $tableEscape);
+define('TABLE_STORY',         $tableEscape . $config->db->prefix . 'story' . $tableEscape);
+define('TABLE_STORYSPEC',     $tableEscape . $config->db->prefix . 'storyspec' . $tableEscape);
+define('TABLE_STORYREVIEW',   $tableEscape . $config->db->prefix . 'storyreview' . $tableEscape);
+define('TABLE_STORYSTAGE',    $tableEscape . $config->db->prefix . 'storystage' . $tableEscape);
+define('TABLE_STORYESTIMATE', $tableEscape . $config->db->prefix . 'storyestimate' . $tableEscape);
+define('TABLE_PRODUCTPLAN',   $tableEscape . $config->db->prefix . 'productplan' . $tableEscape);
+define('TABLE_PLANSTORY',     $tableEscape . $config->db->prefix . 'planstory' . $tableEscape);
+define('TABLE_RELEASE',       $tableEscape . $config->db->prefix . 'release' . $tableEscape);
 
-define('TABLE_PROGRAM',       '`' . $config->db->prefix . 'project`');
-define('TABLE_PROJECT',       '`' . $config->db->prefix . 'project`');
-define('TABLE_EXECUTION',     '`' . $config->db->prefix . 'project`');
-define('TABLE_TASK',          '`' . $config->db->prefix . 'task`');
-define('TABLE_TASKSPEC',      '`' . $config->db->prefix . 'taskspec`');
-define('TABLE_TASKTEAM',      '`' . $config->db->prefix . 'taskteam`');
-define('TABLE_TEAM',          '`' . $config->db->prefix . 'team`');
-define('TABLE_PROJECTADMIN',  '`' . $config->db->prefix . 'projectadmin`');
-define('TABLE_PROJECTPRODUCT','`' . $config->db->prefix . 'projectproduct`');
-define('TABLE_PROJECTSTORY',  '`' . $config->db->prefix . 'projectstory`');
-define('TABLE_PROJECTCASE',   '`' . $config->db->prefix . 'projectcase`');
-define('TABLE_TASKESTIMATE',  '`' . $config->db->prefix . 'taskestimate`');
-define('TABLE_EFFORT',        '`' . $config->db->prefix . 'effort`');
-define('TABLE_BURN',          '`' . $config->db->prefix . 'burn`');
-define('TABLE_CFD',           '`' . $config->db->prefix . 'cfd`');
-define('TABLE_BUILD',         '`' . $config->db->prefix . 'build`');
-define('TABLE_ACL',           '`' . $config->db->prefix . 'acl`');
+define('TABLE_PROGRAM',       $tableEscape . $config->db->prefix . 'project' . $tableEscape);
+define('TABLE_PROJECT',       $tableEscape . $config->db->prefix . 'project' . $tableEscape);
+define('TABLE_EXECUTION',     $tableEscape . $config->db->prefix . 'project' . $tableEscape);
+define('TABLE_TASK',          $tableEscape . $config->db->prefix . 'task' . $tableEscape);
+define('TABLE_TASKSPEC',      $tableEscape . $config->db->prefix . 'taskspec' . $tableEscape);
+define('TABLE_TASKTEAM',      $tableEscape . $config->db->prefix . 'taskteam' . $tableEscape);
+define('TABLE_TEAM',          $tableEscape . $config->db->prefix . 'team' . $tableEscape);
+define('TABLE_PROJECTADMIN',  $tableEscape . $config->db->prefix . 'projectadmin' . $tableEscape);
+define('TABLE_PROJECTPRODUCT',$tableEscape . $config->db->prefix . 'projectproduct' . $tableEscape);
+define('TABLE_PROJECTSTORY',  $tableEscape . $config->db->prefix . 'projectstory' . $tableEscape);
+define('TABLE_PROJECTCASE',   $tableEscape . $config->db->prefix . 'projectcase' . $tableEscape);
+define('TABLE_TASKESTIMATE',  $tableEscape . $config->db->prefix . 'taskestimate' . $tableEscape);
+define('TABLE_EFFORT',        $tableEscape . $config->db->prefix . 'effort' . $tableEscape);
+define('TABLE_BURN',          $tableEscape . $config->db->prefix . 'burn' . $tableEscape);
+define('TABLE_CFD',           $tableEscape . $config->db->prefix . 'cfd' . $tableEscape);
+define('TABLE_BUILD',         $tableEscape . $config->db->prefix . 'build' . $tableEscape);
+define('TABLE_ACL',           $tableEscape . $config->db->prefix . 'acl' . $tableEscape);
 
-define('TABLE_DESIGN',          '`' . $config->db->prefix . 'design`');
-define('TABLE_DESIGNSPEC',      '`' . $config->db->prefix . 'designspec`');
-define('TABLE_DOCLIB',          '`' . $config->db->prefix . 'doclib`');
-define('TABLE_DOC',             '`' . $config->db->prefix . 'doc`');
-define('TABLE_API',             '`' . $config->db->prefix . 'api`');
-define('TABLE_API_SPEC',        '`' . $config->db->prefix . 'apispec`');
-define('TABLE_APISTRUCT',       '`' . $config->db->prefix . 'apistruct`');
-define('TABLE_APISTRUCT_SPEC',  '`' . $config->db->prefix . 'apistruct_spec`');
-define('TABLE_API_LIB_RELEASE', '`' . $config->db->prefix . 'api_lib_release`');
+define('TABLE_DESIGN',          $tableEscape . $config->db->prefix . 'design' . $tableEscape);
+define('TABLE_DESIGNSPEC',      $tableEscape . $config->db->prefix . 'designspec' . $tableEscape);
+define('TABLE_DOCLIB',          $tableEscape . $config->db->prefix . 'doclib' . $tableEscape);
+define('TABLE_DOC',             $tableEscape . $config->db->prefix . 'doc' . $tableEscape);
+define('TABLE_API',             $tableEscape . $config->db->prefix . 'api' . $tableEscape);
+define('TABLE_API_SPEC',        $tableEscape . $config->db->prefix . 'apispec' . $tableEscape);
+define('TABLE_APISTRUCT',       $tableEscape . $config->db->prefix . 'apistruct' . $tableEscape);
+define('TABLE_APISTRUCT_SPEC',  $tableEscape . $config->db->prefix . 'apistruct_spec' . $tableEscape);
+define('TABLE_API_LIB_RELEASE', $tableEscape . $config->db->prefix . 'api_lib_release' . $tableEscape);
 
-define('TABLE_MODULE',        '`' . $config->db->prefix . 'module`');
-define('TABLE_ACTION',        '`' . $config->db->prefix . 'action`');
-define('TABLE_FILE',          '`' . $config->db->prefix . 'file`');
-define('TABLE_HOLIDAY',       '`' . $config->db->prefix . 'holiday`');
-define('TABLE_HISTORY',       '`' . $config->db->prefix . 'history`');
-define('TABLE_EXTENSION',     '`' . $config->db->prefix . 'extension`');
-define('TABLE_CRON',          '`' . $config->db->prefix . 'cron`');
-define('TABLE_BLOCK',         '`' . $config->db->prefix . 'block`');
-define('TABLE_DOCACTION',     '`' . $config->db->prefix . 'docaction`');
-define('TABLE_DOCCONTENT',    '`' . $config->db->prefix . 'doccontent`');
-define('TABLE_TESTSUITE',     '`' . $config->db->prefix . 'testsuite`');
-define('TABLE_SUITECASE',     '`' . $config->db->prefix . 'suitecase`');
-define('TABLE_TESTREPORT',    '`' . $config->db->prefix . 'testreport`');
+define('TABLE_MODULE',        $tableEscape . $config->db->prefix . 'module' . $tableEscape);
+define('TABLE_ACTION',        $tableEscape . $config->db->prefix . 'action' . $tableEscape);
+define('TABLE_FILE',          $tableEscape . $config->db->prefix . 'file' . $tableEscape);
+define('TABLE_HOLIDAY',       $tableEscape . $config->db->prefix . 'holiday' . $tableEscape);
+define('TABLE_HISTORY',       $tableEscape . $config->db->prefix . 'history' . $tableEscape);
+define('TABLE_EXTENSION',     $tableEscape . $config->db->prefix . 'extension' . $tableEscape);
+define('TABLE_CRON',          $tableEscape . $config->db->prefix . 'cron' . $tableEscape);
+define('TABLE_BLOCK',         $tableEscape . $config->db->prefix . 'block' . $tableEscape);
+define('TABLE_DOCACTION',     $tableEscape . $config->db->prefix . 'docaction' . $tableEscape);
+define('TABLE_DOCCONTENT',    $tableEscape . $config->db->prefix . 'doccontent' . $tableEscape);
+define('TABLE_TESTSUITE',     $tableEscape . $config->db->prefix . 'testsuite' . $tableEscape);
+define('TABLE_SUITECASE',     $tableEscape . $config->db->prefix . 'suitecase' . $tableEscape);
+define('TABLE_TESTREPORT',    $tableEscape . $config->db->prefix . 'testreport' . $tableEscape);
 
-define('TABLE_ENTRY',         '`' . $config->db->prefix . 'entry`');
-define('TABLE_WEEKLYREPORT',  '`' . $config->db->prefix . 'weeklyreport`');
-define('TABLE_WEBHOOK',       '`' . $config->db->prefix . 'webhook`');
-define('TABLE_LOG',           '`' . $config->db->prefix . 'log`');
-define('TABLE_SCORE',         '`' . $config->db->prefix . 'score`');
-define('TABLE_NOTIFY',        '`' . $config->db->prefix . 'notify`');
-define('TABLE_OAUTH',         '`' . $config->db->prefix . 'oauth`');
-define('TABLE_PIPELINE',      '`' . $config->db->prefix . 'pipeline`');
-define('TABLE_JOB',           '`' . $config->db->prefix . 'job`');
-define('TABLE_COMPILE',       '`' . $config->db->prefix . 'compile`');
-define('TABLE_MR',            '`' . $config->db->prefix . 'mr`');
-define('TABLE_MRAPPROVAL',    '`' . $config->db->prefix . 'mrapproval`');
+define('TABLE_ENTRY',         $tableEscape . $config->db->prefix . 'entry' . $tableEscape);
+define('TABLE_WEEKLYREPORT',  $tableEscape . $config->db->prefix . 'weeklyreport' . $tableEscape);
+define('TABLE_WEBHOOK',       $tableEscape . $config->db->prefix . 'webhook' . $tableEscape);
+define('TABLE_LOG',           $tableEscape . $config->db->prefix . 'log' . $tableEscape);
+define('TABLE_SCORE',         $tableEscape . $config->db->prefix . 'score' . $tableEscape);
+define('TABLE_NOTIFY',        $tableEscape . $config->db->prefix . 'notify' . $tableEscape);
+define('TABLE_OAUTH',         $tableEscape . $config->db->prefix . 'oauth' . $tableEscape);
+define('TABLE_PIPELINE',      $tableEscape . $config->db->prefix . 'pipeline' . $tableEscape);
+define('TABLE_JOB',           $tableEscape . $config->db->prefix . 'job' . $tableEscape);
+define('TABLE_COMPILE',       $tableEscape . $config->db->prefix . 'compile' . $tableEscape);
+define('TABLE_MR',            $tableEscape . $config->db->prefix . 'mr' . $tableEscape);
+define('TABLE_MRAPPROVAL',    $tableEscape . $config->db->prefix . 'mrapproval' . $tableEscape);
 
-define('TABLE_REPO',         '`' . $config->db->prefix . 'repo`');
-define('TABLE_RELATION',     '`' . $config->db->prefix . 'relation`');
-define('TABLE_REPOHISTORY',  '`' . $config->db->prefix . 'repohistory`');
-define('TABLE_REPOFILES',    '`' . $config->db->prefix . 'repofiles`');
-define('TABLE_REPOBRANCH',   '`' . $config->db->prefix . 'repobranch`');
-define('TABLE_KANBAN',       '`' . $config->db->prefix . 'kanban`');
-define('TABLE_KANBANSPACE',  '`' . $config->db->prefix . 'kanbanspace`');
-define('TABLE_KANBANREGION', '`' . $config->db->prefix . 'kanbanregion`');
-define('TABLE_KANBANLANE',   '`' . $config->db->prefix . 'kanbanlane`');
-define('TABLE_KANBANCOLUMN', '`' . $config->db->prefix . 'kanbancolumn`');
-define('TABLE_KANBANORDER',  '`' . $config->db->prefix . 'kanbanorder`');
-define('TABLE_KANBANGROUP',  '`' . $config->db->prefix . 'kanbangroup`');
-define('TABLE_KANBANCARD',   '`' . $config->db->prefix . 'kanbancard`');
-define('TABLE_KANBANCELL',   '`' . $config->db->prefix . 'kanbancell`');
-if(!defined('TABLE_LANG'))        define('TABLE_LANG', '`' . $config->db->prefix . 'lang`');
-if(!defined('TABLE_PROJECTSPEC')) define('TABLE_PROJECTSPEC', '`' . $config->db->prefix . 'projectspec`');
+define('TABLE_REPO',         $tableEscape . $config->db->prefix . 'repo' . $tableEscape);
+define('TABLE_RELATION',     $tableEscape . $config->db->prefix . 'relation' . $tableEscape);
+define('TABLE_REPOHISTORY',  $tableEscape . $config->db->prefix . 'repohistory' . $tableEscape);
+define('TABLE_REPOFILES',    $tableEscape . $config->db->prefix . 'repofiles' . $tableEscape);
+define('TABLE_REPOBRANCH',   $tableEscape . $config->db->prefix . 'repobranch' . $tableEscape);
+define('TABLE_KANBAN',       $tableEscape . $config->db->prefix . 'kanban' . $tableEscape);
+define('TABLE_KANBANSPACE',  $tableEscape . $config->db->prefix . 'kanbanspace' . $tableEscape);
+define('TABLE_KANBANREGION', $tableEscape . $config->db->prefix . 'kanbanregion' . $tableEscape);
+define('TABLE_KANBANLANE',   $tableEscape . $config->db->prefix . 'kanbanlane' . $tableEscape);
+define('TABLE_KANBANCOLUMN', $tableEscape . $config->db->prefix . 'kanbancolumn' . $tableEscape);
+define('TABLE_KANBANORDER',  $tableEscape . $config->db->prefix . 'kanbanorder' . $tableEscape);
+define('TABLE_KANBANGROUP',  $tableEscape . $config->db->prefix . 'kanbangroup' . $tableEscape);
+define('TABLE_KANBANCARD',   $tableEscape . $config->db->prefix . 'kanbancard' . $tableEscape);
+define('TABLE_KANBANCELL',   $tableEscape . $config->db->prefix . 'kanbancell' . $tableEscape);
+if(!defined('TABLE_LANG'))        define('TABLE_LANG', $tableEscape . $config->db->prefix . 'lang' . $tableEscape);
+if(!defined('TABLE_PROJECTSPEC')) define('TABLE_PROJECTSPEC', $tableEscape . $config->db->prefix . 'projectspec' . $tableEscape);
 
 if(!defined('TABLE_SEARCHINDEX')) define('TABLE_SEARCHINDEX', $config->db->prefix . 'searchindex');
 if(!defined('TABLE_SEARCHDICT'))  define('TABLE_SEARCHDICT',  $config->db->prefix . 'searchdict');
 
-define('TABLE_SCREEN',    '`' . $config->db->prefix . 'screen`');
-define('TABLE_CHART',     '`' . $config->db->prefix . 'chart`');
-define('TABLE_PIVOT',     '`' . $config->db->prefix . 'pivot`');
-define('TABLE_DASHBOARD', '`' . $config->db->prefix . 'dashboard`');
-define('TABLE_DATASET',   '`' . $config->db->prefix . 'dataset`');
-define('TABLE_DATAVIEW',  '`' . $config->db->prefix . 'dataview`');
-define('TABLE_DIMENSION', '`' . $config->db->prefix . 'dimension`');
-define('TABLE_SCENE',    '`' . $config->db->prefix . 'scene`');
-define('VIEW_SCENECASE', '`ztv_scenecase`');
+define('TABLE_SCREEN',    $tableEscape . $config->db->prefix . 'screen' . $tableEscape);
+define('TABLE_CHART',     $tableEscape . $config->db->prefix . 'chart' . $tableEscape);
+define('TABLE_PIVOT',     $tableEscape . $config->db->prefix . 'pivot' . $tableEscape);
+define('TABLE_DASHBOARD', $tableEscape . $config->db->prefix . 'dashboard' . $tableEscape);
+define('TABLE_DATASET',   $tableEscape . $config->db->prefix . 'dataset' . $tableEscape);
+define('TABLE_DATAVIEW',  $tableEscape . $config->db->prefix . 'dataview' . $tableEscape);
+define('TABLE_DIMENSION', $tableEscape . $config->db->prefix . 'dimension' . $tableEscape);
+define('TABLE_SCENE',    $tableEscape . $config->db->prefix . 'scene' . $tableEscape);
+define('VIEW_SCENECASE', '`ztv_scenecase' . $tableEscape);
 
 define('CHANGEVALUE', 100000000);
 
diff --git a/db/update18.3.sql b/db/update18.3.sql
index 9a2336e784..b22f08243f 100644
--- a/db/update18.3.sql
+++ b/db/update18.3.sql
@@ -1215,15 +1215,23 @@ CHANGE `assignedDate` `assignedDate` datetime NULL;
 ALTER TABLE `zt_workflow`
 CHANGE `parent` `parent` varchar(30) NOT NULL DEFAULT '',
 CHANGE `child` `child` varchar(30) NOT NULL DEFAULT '',
+CHANGE `navigator` `navigator` varchar(10) NOT NULL DEFAULT '',
+CHANGE `app` `app` varchar(20) NOT NULL DEFAULT '',
 CHANGE `position` `position` varchar(30) NOT NULL DEFAULT '',
+CHANGE `module` `module` varchar(30) NOT NULL DEFAULT '',
+CHANGE `table` `table` varchar(30) NOT NULL DEFAULT '',
+CHANGE `name` `name` varchar(30) NOT NULL DEFAULT '',
 CHANGE `titleField` `titleField` varchar(30) NOT NULL DEFAULT '',
 CHANGE `contentField` `contentField` text NULL,
 CHANGE `flowchart` `flowchart` text NULL,
 CHANGE `js` `js` text NULL,
 CHANGE `css` `css` text NULL,
-CHANGE `order` `order` smallint unsigned NOT NULL DEFAULT '0',
+CHANGE `order` `order` smallint(5) unsigned NOT NULL DEFAULT '0',
+CHANGE `buildin` `buildin` tinyint(1) unsigned NOT NULL DEFAULT '0',
 CHANGE `administrator` `administrator` text NULL,
 CHANGE `desc` `desc` text NULL,
+CHANGE `createdBy` `createdBy` varchar(30) NOT NULL DEFAULT '',
+CHANGE `createdDate` `createdDate` datetime NULL,
 CHANGE `editedBy` `editedBy` varchar(30) NOT NULL DEFAULT '',
 CHANGE `editedDate` `editedDate` datetime NULL;
 
diff --git a/framework/router.class.php b/framework/router.class.php
index c833bd6f0f..ac909cfb8b 100755
--- a/framework/router.class.php
+++ b/framework/router.class.php
@@ -274,7 +274,7 @@ class router extends baseRouter
         {
             $sql         = new sql();
             $account     = $sql->quote($account);
-            $userSetting = $this->dbh->query('SELECT `key`, `value` FROM ' . TABLE_CONFIG . "WHERE `owner`= $account AND `module`='common' and `key` in ('programLink', 'productLink', 'projectLink', 'executionLink', 'URSR')")->fetchAll();
+            $userSetting = $this->dbh->query('SELECT `key`, `value` FROM ' . TABLE_CONFIG . " WHERE `owner`= $account AND `module`='common' and `key` in ('programLink', 'productLink', 'projectLink', 'executionLink', 'URSR')")->fetchAll();
         }
 
         foreach($userSetting as $setting)