diff --git a/workflow/engine/src/ProcessMaker/BusinessModel/TimerEvent.php b/workflow/engine/src/ProcessMaker/BusinessModel/TimerEvent.php
index 4d4423fdc..de2c8f6ce 100644
--- a/workflow/engine/src/ProcessMaker/BusinessModel/TimerEvent.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/TimerEvent.php
@@ -1190,6 +1190,12 @@ class TimerEvent
             $criteria->addSelectColumn(\BpmnEventPeer::EVN_NAME);
             $criteria->addSelectColumn(\ElementTaskRelationPeer::TAS_UID);
 
+            $arrayCondition = array();
+            $arrayCondition[] = array(\TimerEventPeer::PRJ_UID, \ProcessPeer::PRO_UID, \Criteria::EQUAL);
+            $criteria->addJoinMC($arrayCondition, \Criteria::INNER_JOIN);
+
+            $criteria->add(\ProcessPeer::PRO_STATUS, "ACTIVE", \Criteria::EQUAL);
+
             $arrayCondition = array();
             $arrayCondition[] = array(\TimerEventPeer::PRJ_UID, \ElementTaskRelationPeer::PRJ_UID, \Criteria::EQUAL);
             $arrayCondition[] = array(\TimerEventPeer::EVN_UID, \ElementTaskRelationPeer::ELEMENT_UID, \Criteria::EQUAL);
@@ -1257,6 +1263,8 @@ class TimerEvent
                     if ((int)($hour . $minute) <= (int)($hourCase . $minuteCase)) {
                         $flagCase = $hourCase == $hour && $minuteCase == $minute;
                     } else {
+                        $timerEventNextRunDateNew = $this->getNextRunDateByDataAndDatetime($arrayTimerEventData, $datetime); //Generate new date for old TMREVN_NEXT_RUN_DATE
+
                         $flagCase = true; //Create the old case
                     }
                 }
@@ -1361,6 +1369,12 @@ class TimerEvent
             $criteriaMain->addSelectColumn(\AppDelegationPeer::DEL_DELEGATE_DATE);
             $criteriaMain->addSelectColumn(\BpmnEventPeer::EVN_NAME);
 
+            $arrayCondition = array();
+            $arrayCondition[] = array(\AppDelegationPeer::PRO_UID, \ProcessPeer::PRO_UID, \Criteria::EQUAL);
+            $criteriaMain->addJoinMC($arrayCondition, \Criteria::INNER_JOIN);
+
+            $criteriaMain->add(\ProcessPeer::PRO_STATUS, "ACTIVE", \Criteria::EQUAL);
+
             $arrayCondition = array();
             $arrayCondition[] = array(\AppDelegationPeer::APP_UID, \ApplicationPeer::APP_UID, \Criteria::EQUAL);
             $criteriaMain->addJoinMC($arrayCondition, \Criteria::INNER_JOIN);
diff --git a/workflow/engine/templates/enterprise/addonsStore.js b/workflow/engine/templates/enterprise/addonsStore.js
index 15b0bedef..1a417566d 100644
--- a/workflow/engine/templates/enterprise/addonsStore.js
+++ b/workflow/engine/templates/enterprise/addonsStore.js
@@ -1492,38 +1492,6 @@ Ext.onReady(function() {
         listeners: {
             render: function(){
                 this.loadMask = new Ext.LoadMask(this.body, {msg:_('ID_LOADING_GRID')});
-            },
-            "cellclick": function (grid, rowIndex, columnIndex, e) {
-                var record = grid.getStore().getAt(rowIndex);
-                var fieldName = grid.getColumnModel().getDataIndex(columnIndex);
-
-                if (fieldName != "status") {
-                  return;
-                }
-
-                switch (record.get("status")) {
-                    case "upgrade":
-                    case "ready":
-                        if (INTERNET_CONNECTION == 1) {
-                            installAddon(record.get("id"), record.get("store"));
-                        } else {
-                            Ext.MessageBox.alert(_('ID_INFORMATION'), _('ID_NO_INTERNET_CONECTION'));
-                        }
-                        break;
-                    case "download":
-                        Ext.Ajax.request({
-                          url: "addonsStoreAction",
-                          params: {
-                            "action": "cancel",
-                            "addon": record.get("id"),
-                            "store": record.get("store")
-                            }
-                        });
-                        break;
-                    case "available":
-                        addonAvailable(record.get("id"));
-                        break;
-                }
             }
         }
     });
diff --git a/workflow/engine/templates/processes/main.js b/workflow/engine/templates/processes/main.js
index 73e2b0f37..e74df4a45 100755
--- a/workflow/engine/templates/processes/main.js
+++ b/workflow/engine/templates/processes/main.js
@@ -1251,6 +1251,8 @@ importProcess = function()
                                                   Ext.MessageBox.show({
                                                       title: _("ID_ERROR"),
                                                       msg: "<div style=\"overflow: auto; width: 500px; height: 150px;\">" + stringReplace("\\x0A", "<br />", resp_.message) + "</div>", //\n 10
+                                                      width: 570,
+                                                      height: 250,
                                                       icon: Ext.MessageBox.ERROR,
                                                       buttons: Ext.MessageBox.OK
                                                   });