diff --git a/public_html/deployment/classes/projectlist.class.php b/public_html/deployment/classes/projectlist.class.php
index 0af9a4168de43db23bcf3a6aac612d2bb97b59bc..50928a260aa69eba84a6b2e64b9b046fd7e2354e 100644
--- a/public_html/deployment/classes/projectlist.class.php
+++ b/public_html/deployment/classes/projectlist.class.php
@@ -79,7 +79,8 @@ class projectlist {
                 $sOutPhases.=$oPrj->renderAllPhaseDetails($sPhase,true,false);
             }
 
-            $sOut2 .= '<div class="'.$sPrj.' '.$sTrClass.' prjbox" >'
+            $sOut2 .= '<div class="'.$sPrj.' '.$sTrClass.' prjbox" '
+                    . '     onclick="$(\'#prjfilter\').val(\''.$sPrj.'\'); window.setTimeout(\'filterOverviewTable();\', 10);setview(\'extended\');">'
                     . '<strong>'
                     . '<a href="/deployment/'.$sPrj.'/" ><i class=" icon-book"></i> '.$oPrj->getLabel().'</a>'
                     . '</strong><br>'
@@ -88,7 +89,8 @@ class projectlist {
             
             // render output
             $sOut.='
-                <tr class="'.$sPrj.' '.$sTrClass.'" onclick="location.href=\'/deployment/'.$sPrj.'/\'">
+                <!-- <tr class="'.$sPrj.' '.$sTrClass.'" onclick="location.href=\'/deployment/'.$sPrj.'/\'"> -->
+                <tr class="'.$sPrj.' '.$sTrClass.'" onclick="$(\'#prjfilter\').val(\''.$sPrj.'\'); window.setTimeout(\'filterOverviewTable();\', 10);">
                     <td class="prj">
                         <strong>
                             <a href="/deployment/'.$sPrj.'/" ><i class=" icon-book"></i> '.$oPrj->getLabel().'</a>
@@ -166,11 +168,14 @@ class projectlist {
 
                         var sPrj=$("#prjfilter").val(localStorage.getItem("selectedPrj"));
                         var sPhase=$("#phasefilter").val(localStorage.getItem("selectedPhase"));
-                        window.setTimeout("filterOverviewTable();", 50);
+                        if (sPrj + sPhase) {
+                            window.setTimeout("filterOverviewTable();", 10);
+                        }
                         
-                        $("#efilter").val(localStorage.getItem("efilter"));
-                        // filterTable();
-                        window.setTimeout("filterTable();", 50);
+                        if (localStorage.getItem("efilter")) {
+                            $("#efilter").val(localStorage.getItem("efilter"));
+                            window.setTimeout("filterTable();", 10);
+                        }
                         
                         var sMode=localStorage.getItem("mode");
                         if (sMode)setview(sMode);
@@ -227,10 +232,10 @@ class projectlist {
                             '.$sPhaseFilter.'
                         </select>
                         
-                        <a href="#" class="btn" id="btnresetfilter" 
-                            title="Filter zurücksetzen"
-                            onclick="resetFilter();">Reset</a>
                     </span>
+                        <a href="#" class="" id="btnresetfilter" 
+                            title="Filter zurücksetzen"
+                            onclick="resetFilter();"><i class="icon-remove"></i> Reset Filter</a>
                     
                 </div>
 
@@ -254,7 +259,7 @@ class projectlist {
 			</thead>
 			<tbody>
 		' . $sOut . '</tbody></table>'
-                    . '<script>setDefaultView();</script>';
+                    . '<script>window.setTimeout("setDefaultView();", 50);</script>';
         } else {
             $sOut ='<strong>Hinweis</strong><br>'
                     . 'Es wurde noch kein Projekt eingerichtet.<br><br>'