diff --git a/public_html/deployment/classes/project.class.php b/public_html/deployment/classes/project.class.php
index 04b54425804bf4a2f312f4d47b6f437a06640858..69c97fb967dd60de90ac64964e1b1e569e8b9929 100644
--- a/public_html/deployment/classes/project.class.php
+++ b/public_html/deployment/classes/project.class.php
@@ -2065,8 +2065,10 @@ class project {
         }
         if ($sFunction == "accept") {
             $sRole = 'developer';
-            if ($sNext == "live")
+            if ($sNext == "live"){
                 $sRole = 'pl';
+                // $aLinkdata[$sFunction]['icon']='glyphicon glyphicon-star';
+            }
         }
 
         $sClass = $sPhase;
diff --git a/public_html/deployment/classes/projectlist.class.php b/public_html/deployment/classes/projectlist.class.php
index 772e33657eea287d23943cfd6b8c57bc4273a69f..7157983c084b5752d69408dc5d0968718713693f 100644
--- a/public_html/deployment/classes/projectlist.class.php
+++ b/public_html/deployment/classes/projectlist.class.php
@@ -212,30 +212,33 @@ class projectlist extends base{
                     */
                     function setDefaultView(){
 
-                        if(localStorage.getItem("selectedPrj")!=\'null\'){
+                        if(localStorage.getItem("selectedPrj") && localStorage.getItem("selectedPrj")!=\'null\'){
                             $("#prjfilter").val(localStorage.getItem("selectedPrj"));
                         } else {
                             $("#prjfilter").val($("#prjfilter option:first").val());
                         }
 
-                        if (localStorage.getItem("selectedPhase")!=\'null\'){
+                        if (localStorage.getItem("selectedPhase") && localStorage.getItem("selectedPhase")!=\'null\'){
                             $("#phasefilter").val(localStorage.getItem("selectedPhase"));
                         } else {
                             $("#phasefilter").val($("#phasefilter option:first").val());
                         }
-                        window.setTimeout("filterOverviewTable();", 10);
+                        // window.setTimeout("filterOverviewTable();", 10);
+                        filterOverviewTable();
                         
-                        if (localStorage.getItem("efilter")!=\'null\') {
+                        if (localStorage.getItem("efilter") && localStorage.getItem("efilter")!=\'null\') {
                             $("#efilter").val(localStorage.getItem("efilter"));
                             window.setTimeout("filterTable();", 10);
                         }
-                        if (localStorage.getItem("role")!=\'null\') {
+                        if (localStorage.getItem("role") && localStorage.getItem("role")!=\'null\') {
                             $("#rolefilter").val(localStorage.getItem("role"));
                             window.setTimeout("setrole();", 20);
                         }
                         
-                        var sMode=localStorage.getItem("mode");
-                        if (sMode)setview(sMode);
+                        if (localStorage.getItem("mode") && localStorage.getItem("mode")!=\'null\') {
+                            var sMode=localStorage.getItem("mode");
+                            if (sMode)setview(sMode);
+                        }
                     }
                     
                     /**