diff --git a/workflow/engine/classes/class.serverConfiguration.php b/workflow/engine/classes/class.serverConfiguration.php
index 85dfef7ac..f02787a50 100755
--- a/workflow/engine/classes/class.serverConfiguration.php
+++ b/workflow/engine/classes/class.serverConfiguration.php
@@ -213,7 +213,7 @@ class serverConf {
 
   /**
    * Will return a list of all WS in this system and their related information.
-   * @uses getWorkspaceInfo
+   * @uses getWSList
    * param
    * @return array
    */
@@ -226,7 +226,6 @@ class serverConf {
           if (($file != ".") && ($file != "..")) {
             if (file_exists ( PATH_DB . $file . '/db.php' )) { //print $file."/db.php <hr>";
               $statusl = ($this->isWSDisabled ( $file )) ? 'DISABLED' : 'ENABLED';
-              //$wsInfo = $this->getWorkspaceInfo ( $file );
               if(isset($this->aWSinfo[$file])){
                 $wsInfo = $this->aWSinfo[$file];
               }else{
diff --git a/workflow/engine/config/schema.xml b/workflow/engine/config/schema.xml
index 59b7345c2..4f48dba98 100755
--- a/workflow/engine/config/schema.xml
+++ b/workflow/engine/config/schema.xml
@@ -68,6 +68,15 @@
         <parameter name="Seq_in_index" value="1"/>
       </vendor>
     </index>
+    <index name="indexAppStatus">
+      <index-column name="APP_STATUS"/>
+      <vendor type="mysql">
+        <parameter name="Table" value="APPLICATION"/>
+        <parameter name="Non_unique" value="1"/>
+        <parameter name="Key_name" value="indexAppStatus"/>
+        <parameter name="Seq_in_index" value="1"/>
+      </vendor>
+    </index>
   </table>
   <table name="APP_DELEGATION">
     <vendor type="mysql">
diff --git a/workflow/engine/data/mssql/schema.sql b/workflow/engine/data/mssql/schema.sql
index f98924b60..7be5e32f0 100755
--- a/workflow/engine/data/mssql/schema.sql
+++ b/workflow/engine/data/mssql/schema.sql
@@ -53,6 +53,10 @@ CREATE TABLE [APPLICATION]
 
 CREATE INDEX [indexApp] ON [APPLICATION] ([PRO_UID],[APP_STATUS],[APP_UID]);
 
+CREATE INDEX [indexAppNumber] ON [APPLICATION] ([APP_NUMBER]);
+
+CREATE INDEX [indexAppStatus] ON [APPLICATION] ([APP_STATUS]);
+
 /* ---------------------------------------------------------------------- */
 /* APP_DELEGATION											*/
 /* ---------------------------------------------------------------------- */
diff --git a/workflow/engine/data/mysql/schema.sql b/workflow/engine/data/mysql/schema.sql
index 08771c673..b40b4b14f 100755
--- a/workflow/engine/data/mysql/schema.sql
+++ b/workflow/engine/data/mysql/schema.sql
@@ -30,7 +30,8 @@ CREATE TABLE `APPLICATION`
 	`APP_PIN` VARCHAR(32) default '' NOT NULL,
 	PRIMARY KEY (`APP_UID`),
 	KEY `indexApp`(`PRO_UID`, `APP_STATUS`, `APP_UID`),
-	KEY `indexAppNumber`(`APP_NUMBER`)
+	KEY `indexAppNumber`(`APP_NUMBER`),
+	KEY `indexAppStatus`(`APP_STATUS`)
 )ENGINE=MyISAM  DEFAULT CHARSET='utf8' COMMENT='The application';
 #-----------------------------------------------------------------------------
 #-- APP_DELEGATION
diff --git a/workflow/engine/methods/login/authentication.php b/workflow/engine/methods/login/authentication.php
index 21756666a..a233c0074 100755
--- a/workflow/engine/methods/login/authentication.php
+++ b/workflow/engine/methods/login/authentication.php
@@ -212,7 +212,14 @@ try {
     /**end log**/
 
     //************** background processes, here we are putting some back office routines **********
-    $oServerConf->setWsInfo(SYS_SYS,$oServerConf->getWorkspaceInfo(SYS_SYS) );
+    $heartBeatNWIDate = $oServerConf->getHeartbeatProperty('HB_NEXT_GWI_DATE','HEART_BEAT_CONF');
+    if (is_null($heartBeatNWIDate)) {
+      $heartBeatNWIDate = time();
+    }
+    if (time() >= $heartBeatNWIDate) {
+      $oServerConf->setWsInfo(SYS_SYS, $oServerConf->getWorkspaceInfo(SYS_SYS));
+      $oServerConf->setHeartbeatProperty('HB_NEXT_GWI_DATE', strtotime('+1 day'), 'HEART_BEAT_CONF');
+    }
 
     //**** defining and saving server info, this file has the values of the global array $_SERVER ****
     //this file is useful for command line environment (no Browser), I mean for triggers, crons and other executed over command line