diff --git a/htroot/CrawlResults.html b/htroot/CrawlResults.html
index 9ac957e37f..be44f22f66 100644
--- a/htroot/CrawlResults.html
+++ b/htroot/CrawlResults.html
@@ -119,7 +119,7 @@ <h2>(7) Results from surrogates import</h2>
     #(size)#
     Showing all #[all]# entries in this stack.
     ::
-    Showing latest #[count]# lines from a stack of #[all]# entries.
+    Showing latest #[count]# lines from a stack of #[all]# entries. <a href="CrawlResults.html?process=#[tabletype]#&count=2147483647">Show all</a>
     #(/size)#
     </em></p>
     <table >
diff --git a/htroot/CrawlResults.java b/htroot/CrawlResults.java
index e23a9f19f7..ef9c2312b4 100644
--- a/htroot/CrawlResults.java
+++ b/htroot/CrawlResults.java
@@ -58,12 +58,15 @@ public class CrawlResults {
     /** Used for logging. */
     private static final String APP_NAME = "PLASMA";
     
+    /** Default maximum lines number of the indexed table */
+    private static final int DEFAULT_MAXIMUM_LINES = 500;
+    
     public static serverObjects respond(final RequestHeader header, serverObjects post, final serverSwitch env) {
         // return variable that accumulates replacements
         final Switchboard sb = (Switchboard) env;
         final serverObjects prop = new serverObjects();
 
-        int lines = 500;
+        int lines = DEFAULT_MAXIMUM_LINES;
         boolean showCollection = sb.index.fulltext().getDefaultConfiguration().isEmpty() || sb.index.fulltext().getDefaultConfiguration().contains(CollectionSchema.collection_sxt);
         boolean showInit    = env.getConfigBool("IndexMonitorInit", false);
         boolean showExec    = env.getConfigBool("IndexMonitorExec", false);
@@ -118,7 +121,7 @@ public static serverObjects respond(final RequestHeader header, serverObjects po
         if (post != null) {
             // custom number of lines
             if (post.containsKey("count")) {
-                lines = post.getInt("count", 500);
+                lines = post.getInt("count", DEFAULT_MAXIMUM_LINES);
             }
 
             // do the commands
@@ -154,7 +157,7 @@ public static serverObjects respond(final RequestHeader header, serverObjects po
             }
 
             if (post.containsKey("moreIndexed")) {
-                lines = post.getInt("showIndexed", 500);
+                lines = post.getInt("showIndexed", DEFAULT_MAXIMUM_LINES);
             }
 
             if (post.get("si") != null) showInit    = !("0".equals(post.get("si")));
@@ -180,6 +183,7 @@ public static serverObjects respond(final RequestHeader header, serverObjects po
             } else {
                 prop.put("table_size", "1");
                 prop.put("table_size_count", lines);
+                prop.put("table_size_tabletype", tabletype.getCode());
             }
             prop.put("table_size_all", ResultURLs.getStackSize(tabletype));
 
@@ -203,7 +207,7 @@ public static serverObjects respond(final RequestHeader header, serverObjects po
             int cnt = 0;
             final Iterator<Map.Entry<String, InitExecEntry>> i = ResultURLs.results(tabletype);
             Map.Entry<String, InitExecEntry> entry;
-            while (i.hasNext()) {
+            while (i.hasNext() && cnt < lines) {
                 entry = i.next();
                 try {
                     byte[] urlhash = UTF8.getBytes(entry.getKey());