diff --git a/workflow/engine/classes/model/AppDelegationPeer.php b/workflow/engine/classes/model/AppDelegationPeer.php
index fdce86b80..7fe1ab17b 100755
--- a/workflow/engine/classes/model/AppDelegationPeer.php
+++ b/workflow/engine/classes/model/AppDelegationPeer.php
@@ -25,10 +25,10 @@
  */
 
   // include base peer class
-  require_once 'classes/model/om/BaseAppDelegationPeer.php';
+  //require_once 'classes/model/om/BaseAppDelegationPeer.php';
 
   // include object class
-  include_once 'classes/model/AppDelegation.php';
+  //include_once 'classes/model/AppDelegation.php';
 
 
 /**
diff --git a/workflow/engine/classes/model/om/BaseAppNotesPeer.php b/workflow/engine/classes/model/om/BaseAppNotesPeer.php
index 2efabc48c..384cf797e 100755
--- a/workflow/engine/classes/model/om/BaseAppNotesPeer.php
+++ b/workflow/engine/classes/model/om/BaseAppNotesPeer.php
@@ -3,7 +3,7 @@
 require_once 'propel/util/BasePeer.php';
 // The object class -- needed for instanceof checks in this class.
 // actual class may be a subclass -- as returned by AppNotesPeer::getOMClass()
-include_once 'classes/model/AppNotes.php';
+//include_once 'classes/model/AppNotes.php';
 
 /**
  * Base static class for performing query and update operations on the 'APP_NOTES' table.
diff --git a/workflow/engine/controllers/appProxy.php b/workflow/engine/controllers/appProxy.php
index b9d31cd71..a83bcfcb3 100644
--- a/workflow/engine/controllers/appProxy.php
+++ b/workflow/engine/controllers/appProxy.php
@@ -38,12 +38,25 @@ class AppProxy extends HttpProxyController
         if (!isset($_SESSION['PROCESS']) && !isset($httpData->pro)) {
             $caseLoad = $case->loadCase($appUid);
             $httpData->pro = $caseLoad['PRO_UID'];
+        }    
+        
+        if(!isset($httpData->pro) || empty($httpData->pro) )
+        {
+            $proUid = $_SESSION['PROCESS'];
+        } else {
+            $proUid = $httpData->pro;
         }
-
-        $proUid = (!isset($httpData->pro)) ? $_SESSION['PROCESS'] : $httpData->pro;
-        $tasUid = (!isset($httpData->tas)) ? ((isset($_SESSION['TASK'])) ? $_SESSION['TASK'] : '') : $httpData->tas;
+        
+        if(!isset($httpData->tas) || empty($httpData->tas))
+        {
+            $tasUid = $_SESSION['TASK'];
+        } else {
+            $tasUid = $httpData->tas;
+        }
+        //$proUid = (!isset($httpData->pro)) ? $_SESSION['PROCESS'] : $httpData->pro;
+        //$tasUid = (!isset($httpData->tas)) ? ((isset($_SESSION['TASK'])) ? $_SESSION['TASK'] : '') : $httpData->tas;
         $usrUid = $_SESSION['USER_LOGGED'];
-
+        
         $respView = $case->getAllObjectsFrom( $proUid, $appUid, $tasUid, $usrUid, 'VIEW' );
         $respBlock = $case->getAllObjectsFrom( $proUid, $appUid, $tasUid, $usrUid, 'BLOCK' );
 
@@ -52,7 +65,7 @@ class AppProxy extends HttpProxyController
             );
         }
 
-        require_once ("classes/model/AppNotes.php");
+        //require_once ("classes/model/AppNotes.php");
 
         if (! isset( $appUid )) {
             throw new Exception( 'Can\'t resolve the Apllication ID for this request.' );
@@ -73,7 +86,7 @@ class AppProxy extends HttpProxyController
      */
     function postNote ($httpData)
     {
-        require_once ("classes/model/AppNotes.php");
+        //require_once ("classes/model/AppNotes.php");
 
         //extract(getExtJSParams());
         if (isset( $httpData->appUid ) && trim( $httpData->appUid ) != "") {
@@ -91,7 +104,7 @@ class AppProxy extends HttpProxyController
 
         //Disabling the controller response because we handle a special behavior
         $this->setSendResponse(false);
-
+        
         //Add note case
         $appNote = new AppNotes();
         $response = $appNote->addCaseNote($appUid, $usrUid, $noteContent, intval($httpData->swSendMail));
diff --git a/workflow/engine/templates/app/main.js b/workflow/engine/templates/app/main.js
index 874eaae80..7ecc139c4 100644
--- a/workflow/engine/templates/app/main.js
+++ b/workflow/engine/templates/app/main.js
@@ -221,7 +221,7 @@ function openCaseNotesWindow(appUid1, modalSw, appTitle, proUid, taskUid)
           text: _('ID_CANCEL'),
           cls: 'x-toolbar1',
           //iconCls: 'xx',
-          icon: '/images/add_notes.png',
+          //icon: '/images/add_notes.png',
           handler: newNoteHandler,
           tooltip: {
             title: _('ID_CASES_NOTES_ADD'),
diff --git a/workflow/public_html/sysGeneric.php b/workflow/public_html/sysGeneric.php
index 7a299a61d..d830f4418 100755
--- a/workflow/public_html/sysGeneric.php
+++ b/workflow/public_html/sysGeneric.php
@@ -448,6 +448,7 @@ Bootstrap::registerClass('Task',               PATH_HOME . "engine/classes/model
 Bootstrap::registerClass('TaskPeer',           PATH_HOME . "engine/classes/model/TaskPeer.php");
 Bootstrap::registerClass('dates',              PATH_HOME . "engine/classes/class.dates.php");
 Bootstrap::registerClass('AppDelegation',      PATH_HOME . "engine/classes/model/AppDelegation.php");
+Bootstrap::registerClass('BaseAppDelegationPeer',PATH_HOME . "engine/classes/model/om/BaseAppDelegationPeer.php");
 Bootstrap::registerClass('AppDelegationPeer',  PATH_HOME . "engine/classes/model/AppDelegationPeer.php");
 Bootstrap::registerClass('BaseAppDelay',       PATH_HOME . "engine/classes/model/om/BaseAppDelay.php");
 Bootstrap::registerClass('AppDelayPeer',       PATH_HOME . "engine/classes/model/AppDelayPeer.php");