page number computation fix

1 files changed, 4 insertions, 2 deletions

diff --git a/htroot/js/yacysort.js b/htroot/js/yacysort.js
index e2d9bd835..007c3d3d3 100644
--- a/htroot/js/yacysort.js
+++ b/htroot/js/yacysort.js
@@ -115,7 +115,8 @@ var numberedPage = function(pageNumber) {
   // Check if the pageNumber is too high before updating the currentPage
   var checkedPageNumber;
   if(allItems.length > 0) {
-	  checkedPageNumber = Math.min(pageNumber, Math.floor(allItems.length / requestedResults));
+	  //checkedPageNumber = Math.min(pageNumber, Math.floor(allItems.length / requestedResults));
+      checkedPageNumber = Math.min(pageNumber, Math.floor((allItems.length - 1) / requestedResults));
   } else {
 	  checkedPageNumber = 0;
   }
@@ -341,7 +342,8 @@ var processLatestInfo = function(latestInfo) {
 }
 
 var processItem = function(data) {
-  var newItem = $(data);
+  var $data = $(data);
+  var newItem = $data.is(".searchresults") ? $data : $data.find(".searchresults").first();
   newItem.addClass("hidden fresh");
 
   /* If we didn't get a valid response from YaCy, wait a bit and check if the results feeders are still running on the server side */