diff --git a/workflow/engine/config/schema.xml b/workflow/engine/config/schema.xml
index 5e1d5981e..a9b23a22b 100644
--- a/workflow/engine/config/schema.xml
+++ b/workflow/engine/config/schema.xml
@@ -328,6 +328,10 @@
             <index-column name="DOC_VERSION"/>
             <index-column name="APP_DOC_TYPE"/>
         </index>
+        <index name="indexFolderUidDocStatus">
+            <index-column name="FOLDER_UID"/>
+            <index-column name="APP_DOC_STATUS"/>
+        </index>
     </table>
     <table name="APP_MESSAGE" idMethod="native">
         <vendor type="mysql">
@@ -1310,6 +1314,16 @@
             <rule name="validValues" value="DYNAFORM|INPUT_DOCUMENT|MESSAGE|OUTPUT_DOCUMENT|EXTERNAL"
                   message="Please select a valid value for STEP_TYPE_OBJ."/>
         </validator>
+        <index name="indexTasUidTypeUidObj">
+            <index-column name="TAS_UID"/>
+            <index-column name="STEP_TYPE_OBJ"/>
+            <index-column name="STEP_UID_OBJ"/>
+        </index>
+        <index name="indexProUidTasUidPosition">
+            <index-column name="PRO_UID"/>
+            <index-column name="TAS_UID"/>
+            <index-column name="STEP_POSITION"/>
+        </index>
     </table>
     <table name="STEP_TRIGGER">
         <vendor type="mysql">
@@ -1559,6 +1573,10 @@
             <rule name="validValues" value="NORMAL|FAST|AUTOMATIC"
                   message="Please select a valid value for TAS_DERIVATION."/>
         </validator>
+        <index name="indexAssgTypeGrpVar">
+            <index-column name="TAS_ASSIGN_TYPE"/>
+            <index-column name="TAS_GROUP_VARIABLE"/>
+        </index>
     </table>
     <table name="TASK_USER">
         <vendor type="mysql">
@@ -1603,6 +1621,10 @@
             <rule name="validValues" value="1|2" message="Please select a valid relation."/>
             <rule name="required" message="Relation is required."/>
         </validator>
+        <index name="indexUsrUidType">
+            <index-column name="USR_UID"/>
+            <index-column name="TU_TYPE"/>
+        </index>
     </table>
     <table name="TRANSLATION">
         <vendor type="mysql">
diff --git a/workflow/engine/data/mysql/schema.sql b/workflow/engine/data/mysql/schema.sql
index 75a53edcd..0d2445581 100644
--- a/workflow/engine/data/mysql/schema.sql
+++ b/workflow/engine/data/mysql/schema.sql
@@ -136,7 +136,8 @@ CREATE TABLE `APP_DOCUMENT`
 	PRIMARY KEY (`APP_DOC_UID`,`DOC_VERSION`),
 	KEY `indexAppDocument`(`FOLDER_UID`, `APP_DOC_UID`),
 	KEY `indexAppUid`(`APP_UID`),
-	KEY `indexAppUidDocUidDocVersionDocType`(`APP_UID`, `DOC_UID`, `DOC_VERSION`, `APP_DOC_TYPE`)
+	KEY `indexAppUidDocUidDocVersionDocType`(`APP_UID`, `DOC_UID`, `DOC_VERSION`, `APP_DOC_TYPE`),
+	KEY `indexFolderUidDocStatus`(`FOLDER_UID`, `APP_DOC_STATUS`)
 )ENGINE=InnoDB  DEFAULT CHARSET='utf8' COMMENT='Documents in an Application';
 #-----------------------------------------------------------------------------
 #-- APP_MESSAGE
@@ -619,7 +620,9 @@ CREATE TABLE `STEP`
 	`STEP_CONDITION` MEDIUMTEXT  NOT NULL,
 	`STEP_POSITION` INTEGER default 0 NOT NULL,
 	`STEP_MODE` VARCHAR(10) default 'EDIT',
-	PRIMARY KEY (`STEP_UID`)
+	PRIMARY KEY (`STEP_UID`),
+	KEY `indexTasUidTypeUidObj`(`TAS_UID`, `STEP_TYPE_OBJ`, `STEP_UID_OBJ`),
+	KEY `indexProUidTasUidPosition`(`PRO_UID`, `TAS_UID`, `STEP_POSITION`)
 )ENGINE=InnoDB  DEFAULT CHARSET='utf8';
 #-----------------------------------------------------------------------------
 #-- STEP_TRIGGER
@@ -735,7 +738,8 @@ CREATE TABLE `TASK`
 	`TAS_RECEIVE_MESSAGE` MEDIUMTEXT,
 	PRIMARY KEY (`TAS_UID`),
 	UNIQUE KEY `INDEX_TAS_ID` (`TAS_ID`),
-	KEY `indexTasUid`(`TAS_UID`)
+	KEY `indexTasUid`(`TAS_UID`),
+	KEY `indexAssgTypeGrpVar`(`TAS_ASSIGN_TYPE`, `TAS_GROUP_VARIABLE`)
 )ENGINE=InnoDB  DEFAULT CHARSET='utf8' COMMENT='Task of workflow';
 #-----------------------------------------------------------------------------
 #-- TASK_USER
@@ -752,7 +756,8 @@ CREATE TABLE `TASK_USER`
 	`TU_TYPE` INTEGER default 1 NOT NULL,
 	`TU_RELATION` INTEGER default 0 NOT NULL,
 	`ASSIGNED_ID` INTEGER default 0,
-	PRIMARY KEY (`TAS_UID`,`USR_UID`,`TU_TYPE`,`TU_RELATION`)
+	PRIMARY KEY (`TAS_UID`,`USR_UID`,`TU_TYPE`,`TU_RELATION`),
+	KEY `indexUsrUidType`(`USR_UID`, `TU_TYPE`)
 )ENGINE=InnoDB  DEFAULT CHARSET='utf8';
 #-----------------------------------------------------------------------------
 #-- TRANSLATION