diff --git a/.gitignore b/.gitignore
index 42838eb61298d85e9f5a3f9e07c3ee91f0eb29f0..e7719900d590f77637a881ba53800d59425caa25 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
-/data/
-/nbproject/
-/cronjobs.html
-/winscp.rnd
-config/inc_cronlog.php
+/data/
+/nbproject/
+/cronjobs.html
+/winscp.rnd
+config/inc_cronlog.php
+/data__/
\ No newline at end of file
diff --git a/classes/cronlog-renderer.class.php b/classes/cronlog-renderer.class.php
index adc85eb52ab560b196d82ef0176fba11596bcd56..d195b4753974c4315811a5aba2a0e7f496a094fc 100644
--- a/classes/cronlog-renderer.class.php
+++ b/classes/cronlog-renderer.class.php
@@ -498,19 +498,22 @@ class cronlogrenderer extends cronlog{
      */
     public function renderServerlist($sSelectedItem=false){
         $sHtml='';
+        $iMaxItemsToShow=30;
         $sHtml.='<option value="ALL"'
                 .($sSelectedItem===false || $sSelectedItem==='ALL' ? ' selected="selected"' : '')
-                . '>[ALLE]</option>';
+                . '>[ALLE ('.count($this->getServers()).')]</option>';
         foreach($this->getServers() as $sServer=>$aData){
             $sHtml.='<option value="'.$sServer.'"'
                     .($sSelectedItem===$sServer ? ' selected="selected"' : '')
                     .'>'.$sServer.'</option>';
         }
-        $sHtml=$sHtml ? '<select'
-                . ' size="'.(count($this->getServers())+1).'"'
-                // . ' size="1"'
-                . ' onchange="setServer(this.value); return false;"'
-                . '>'.$sHtml.'</select>' : false;
+        $sHtml=$sHtml 
+                ? '<select'
+                    . ' size="'.( min(array(count($this->getServers())+1 , $iMaxItemsToShow)) ).'"'
+                    // . ' size="1"'
+                    . ' onchange="setServer(this.value); return false;"'
+                    . '>'.$sHtml.'</select>' 
+                : false;
         return $sHtml;
     }
     
diff --git a/js/asimax.class.js b/js/asimax.class.js
index 03e3fee7e6badb8a38bb7e6f28679066dc324103..ea49a4b78c796c09f300bc2c167da3ba25cc5e60 100644
--- a/js/asimax.class.js
+++ b/js/asimax.class.js
@@ -134,6 +134,7 @@ var asimax = function () {
             url: url,
             data: queryparams,
             type: this.cfg.apimethod,
+            timeout: 5000, // [ms]
             success: function (data) {
                 $('#' + domid).css('opacity', 1);
                 $('#' + domid).html(data);