diff --git a/public/archivio.php b/public/archivio.php
index 01d7006..c6407ba 100644
--- a/public/archivio.php
+++ b/public/archivio.php
@@ -190,15 +190,27 @@ try {
 									$j = 1;
 									$last = $page +2;
 									if($page-2<1){
-										$j = $page;										
-									}
-									else if($page+2 >$numPages){
-										$j = $numPages-3;
-										$last = $numPages;
+										if($page-1 == 1){
+											$j=$page-1;
+										}
+										else{
+											$j = $page;
+										}						
 									}
 									else{
 										$j = $page - 2;
 									}
+									
+									if($page+2 >$numPages){
+// 										$j=page-2;
+										if($page +1 == $numPages){
+											$last = $page+1;;
+										}
+										else{
+											$last = $page;
+										}
+									}
+									
 									for($j;$j<=$last;$j++){
 										if($j == $page){
 											?>
diff --git a/public/searchResults.php b/public/searchResults.php
index 4cd7e0b..29df100 100644
--- a/public/searchResults.php
+++ b/public/searchResults.php
@@ -130,15 +130,25 @@ try {
 					$j = 1;
 					$last = $page +2;
 					if($page-2<1){
-						$j = $page;
-					}
-					else if($page+2 >$numPages){
-						$j = $numPages-3;
-						$last = $numPages;
+						if($page-1 == 1){
+							$j=$page-1;
+						}
+						else{
+							$j = $page;
+						}						
 					}
 					else{
 						$j = $page - 2;
 					}
+					
+					if($page+2 >$numPages){
+						if($page +1 == $numPages){
+							$last = $page+1;;
+						}
+						else{
+							$last = $page;
+						}
+					}
 					for($j;$j<=$last;$j++){
 						if($j == $page){
 							?>