diff --git a/.gitignore b/.gitignore
index 6e7222b28..bb2664051 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,3 +38,4 @@ update.sh
 workflow/public_html/translations/
 build-prod.zip
 node_modules
+/workflow/engine/config/system-tables.ini
diff --git a/workflow/engine/config/schema.xml b/workflow/engine/config/schema.xml
index f6cc1908f..f3242085a 100644
--- a/workflow/engine/config/schema.xml
+++ b/workflow/engine/config/schema.xml
@@ -2043,6 +2043,9 @@
     <column name="DYN_UID" type="VARCHAR" size="32" required="true" default=""/>
     <column name="REP_TAB_UID" type="VARCHAR" size="32" required="true" default=""/>
     <column name="CON_STATUS" type="VARCHAR" size="20" required="true" default="ACTIVE"/>
+    <index name="indexConStatus">
+      <index-column name="CON_STATUS"/>
+    </index>
   </table>
   <table name="STAGE">
     <vendor type="mysql">
@@ -2546,6 +2549,11 @@
     <column name="APP_FINISH_DATE" type="TIMESTAMP" required="false"/>
     <column name="APP_UPDATE_DATE" type="TIMESTAMP" required="true"/>
     <column name="APP_OVERDUE_PERCENTAGE" type="DOUBLE" required="true"/>
+    <index name="indexUsrUidThreadStatusAppStatus">
+      <index-column name="USR_UID"/>
+      <index-column name="DEL_THREAD_STATUS"/>
+      <index-column name="APP_STATUS"/>
+    </index>
     <index name="indexAppUid">
       <index-column name="APP_UID"/>
     </index>
diff --git a/workflow/engine/data/mysql/schema.sql b/workflow/engine/data/mysql/schema.sql
index 8031f5dcf..31cf7f758 100644
--- a/workflow/engine/data/mysql/schema.sql
+++ b/workflow/engine/data/mysql/schema.sql
@@ -112,9 +112,9 @@ CREATE TABLE `APP_DOCUMENT`
 	`APP_DOC_STATUS` VARCHAR(32) default 'ACTIVE' NOT NULL,
 	`APP_DOC_STATUS_DATE` DATETIME,
 	`APP_DOC_FIELDNAME` VARCHAR(150),
-  `APP_DOC_DRIVE_DOWNLOAD` MEDIUMTEXT,
-  `SYNC_WITH_DRIVE` VARCHAR(32) default 'UNSYNCHRONIZED' NOT NULL,
-  `SYNC_PERMISSIONS` MEDIUMTEXT,
+	`APP_DOC_DRIVE_DOWNLOAD` MEDIUMTEXT,
+	`SYNC_WITH_DRIVE` VARCHAR(32) default 'UNSYNCHRONIZED' NOT NULL,
+	`SYNC_PERMISSIONS` MEDIUMTEXT,
 	PRIMARY KEY (`APP_DOC_UID`,`DOC_VERSION`),
 	KEY `indexAppDocument`(`FOLDER_UID`, `APP_DOC_UID`)
 )ENGINE=InnoDB  DEFAULT CHARSET='utf8' COMMENT='Documents in an Application';
@@ -193,8 +193,8 @@ CREATE TABLE `CONTENT`
 	`CON_LANG` VARCHAR(10) default '' NOT NULL,
 	`CON_VALUE` MEDIUMTEXT  NOT NULL,
 	PRIMARY KEY (`CON_CATEGORY`,`CON_PARENT`,`CON_ID`,`CON_LANG`),
-    KEY `indexUidLang`(`CON_ID`, `CON_LANG`),
-    KEY `indexCatParUidLang`(`CON_CATEGORY`, `CON_PARENT`, `CON_ID`, `CON_LANG`),
+	KEY `indexUidLang`(`CON_ID`, `CON_LANG`),
+	KEY `indexCatParUidLang`(`CON_CATEGORY`, `CON_PARENT`, `CON_ID`, `CON_LANG`),
 	KEY `indexUid`(`CON_ID`, `CON_CATEGORY`, `CON_LANG`)
 )ENGINE=InnoDB  DEFAULT CHARSET='utf8';
 #-----------------------------------------------------------------------------
@@ -461,7 +461,7 @@ CREATE TABLE `PROCESS`
 	`PRO_COST` DECIMAL(7,2) default 0,
 	`PRO_UNIT_COST` VARCHAR(50) default '',
 	`PRO_ITEE` INTEGER default 0 NOT NULL,
-        `PRO_ACTION_DONE` MEDIUMTEXT,
+	`PRO_ACTION_DONE` MEDIUMTEXT,
 	PRIMARY KEY (`PRO_UID`)
 )ENGINE=InnoDB  DEFAULT CHARSET='utf8' COMMENT='Store process Information';
 #-----------------------------------------------------------------------------
@@ -756,7 +756,7 @@ CREATE TABLE `USERS`
 	`USR_DEFAULT_LANG` VARCHAR(10) default '',
 	`USR_LAST_LOGIN` DATETIME,
 	PRIMARY KEY (`USR_UID`),
-	KEY `indexUsrUid` (`USR_UID`)
+	KEY `indexUsrUid`(`USR_UID`)
 )ENGINE=InnoDB  DEFAULT CHARSET='utf8' COMMENT='Users';
 #-----------------------------------------------------------------------------
 #-- APP_THREAD
@@ -944,7 +944,8 @@ CREATE TABLE `CASE_CONSOLIDATED`
 	`DYN_UID` VARCHAR(32) default '' NOT NULL,
 	`REP_TAB_UID` VARCHAR(32) default '' NOT NULL,
 	`CON_STATUS` VARCHAR(20) default 'ACTIVE' NOT NULL,
-	PRIMARY KEY (`TAS_UID`)
+	PRIMARY KEY (`TAS_UID`),
+	KEY `indexConStatus`(`CON_STATUS`)
 )ENGINE=InnoDB  DEFAULT CHARSET='utf8';
 #-----------------------------------------------------------------------------
 #-- STAGE
@@ -1016,7 +1017,7 @@ DROP TABLE IF EXISTS `LOGIN_LOG`;
 
 CREATE TABLE `LOGIN_LOG`
 (
-    `LOG_ID` INTEGER  NOT NULL AUTO_INCREMENT,
+	`LOG_ID` INTEGER  NOT NULL AUTO_INCREMENT,
 	`LOG_UID` VARCHAR(32) default '' NOT NULL,
 	`LOG_STATUS` VARCHAR(100) default '' NOT NULL,
 	`LOG_IP` VARCHAR(15) default '' NOT NULL,
@@ -1228,6 +1229,7 @@ CREATE TABLE `APP_CACHE_VIEW`
 	`APP_UPDATE_DATE` DATETIME  NOT NULL,
 	`APP_OVERDUE_PERCENTAGE` DOUBLE  NOT NULL,
 	PRIMARY KEY (`APP_UID`,`DEL_INDEX`),
+	KEY `indexUsrUidThreadStatusAppStatus`(`USR_UID`, `DEL_THREAD_STATUS`, `APP_STATUS`),
 	KEY `indexAppUid`(`APP_UID`),
 	KEY `indexTasUid`(`TAS_UID`),
 	KEY `indexUsrUid`(`USR_UID`),
@@ -2704,7 +2706,7 @@ CREATE TABLE `ABE_CONFIGURATION`
 	`ABE_EMAIL_FIELD` VARCHAR(255) default '' NOT NULL,
 	`ABE_ACTION_FIELD` VARCHAR(255) default '',
 	`ABE_CASE_NOTE_IN_RESPONSE` INTEGER default 0,
-	`ABE_FORCE_LOGIN`           INTEGER default 0,
+	`ABE_FORCE_LOGIN` INTEGER default 0,
 	`ABE_CREATE_DATE` DATETIME  NOT NULL,
 	`ABE_UPDATE_DATE` DATETIME,
 	`ABE_SUBJECT_FIELD` VARCHAR(100) default '',