Index: pki/base/common/src/com/netscape/cms/servlet/request/QueryReq.java
===================================================================
--- pki/base/common/src/com/netscape/cms/servlet/request/QueryReq.java	(revision 2343)
+++ pki/base/common/src/com/netscape/cms/servlet/request/QueryReq.java	(working copy)
@@ -439,13 +439,21 @@
     				((count < 0)?count-1:count+1),
     		"requestId");
     		
-    		int totalCount = list.getSize() - list.getCurrentIndex();
+    		int maxCount = 0;
+    		if (count < 0 && jumptoend) {
+    		    maxCount = -count;
+    		} else if (count < 0) {
+    		    maxCount = -count+1;
+    		} else {
+    		    maxCount = count;
+    		}
+    		int totalCount = (jumptoend)? maxCount : (list.getSize() - list.getCurrentIndex());
     		header.addIntegerValue(OUT_TOTALCOUNT, totalCount);
     		header.addIntegerValue(OUT_CURRENTCOUNT, list.getSize());
     		
     		int numEntries = list.getSize() - list.getCurrentIndex();
     		
-    		Vector v = fetchRecords(list,((count < 0)?(-count+1):count));
+    		Vector v = fetchRecords(list,maxCount);
     		v = normalizeOrder(v);
     		trim(v,id);
     		
Index: pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/queryReq.template
===================================================================
--- pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/queryReq.template	(revision 2248)
+++ pki/dogtag/kra-ui/shared/webapps/kra/agent/kra/queryReq.template	(working copy)
@@ -332,10 +332,12 @@
 
 var disabled = "";
 //(result.header.seqNumFromDown== null) ? "disabled='true'" : "";
+var disabledDown = ((result.fixed.maxCount > result.header.currentRecordCount) || (result.header.currentRecordCount == result.header.totalRecordCount))? "disabled='true'" : "";
+var disabledUp = (result.header.firstEntryOnPage != null && result.header.firstEntryOnPage <= 1) ? "disabled='true'" : "";
 
 document.write(
 "<button NAME='begin' onClick='doNext(this)' VALUE='|<<' width='72'>|&lt;&lt;</button>\n"+
-"<button NAME='previous' onClick='doNext(this)' VALUE='<' width='72'>&lt;</button>\n"+
+"<button "+disabledUp+" NAME='previous' onClick='doNext(this)' VALUE='<' width='72'>&lt;</button>\n"+
 "<INPUT TYPE='hidden' NAME='totalRecordCount' VALUE='"+
 result.header.totalRecordCount+ "'>\n"+
 "<INPUT TYPE='hidden' NAME='op' VALUE='"+ "queryReq"+ "'>\n"+
@@ -362,8 +364,8 @@
 
     document.write("<INPUT style='padding-left: 2px;' TYPE=text SIZE=16 NAME=maxCount VALUE='"+
 result.fixed.maxCount+ "'>\n"+
-"<button "+disabled+" NAME='next' onClick='doNext(this)' VALUE='>' width='72'>&gt;</button>\n"+
-"<button "+disabled+" NAME='end' onClick='doNext(this)' VALUE='>>|' width='72'>&gt;&gt;|</button>\n"+
+"<button "+disabledDown+" NAME='next' onClick='doNext(this)' VALUE='>' width='72'>&gt;</button>\n"+
+"<button NAME='end' onClick='doNext(this)' VALUE='>>|' width='72'>&gt;&gt;|</button>\n"+
 "</FORM>\n");
 }
 
Index: pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/queryReq.template
===================================================================
--- pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/queryReq.template	(revision 2248)
+++ pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/queryReq.template	(working copy)
@@ -399,10 +399,12 @@
 
 var disabled = "";
 //(result.header.seqNumFromDown== null) ? "disabled='true'" : "";
+var disabledDown = ((result.fixed.maxCount > result.header.currentRecordCount) || (result.header.currentRecordCount == result.header.totalRecordCount))? "disabled='true'" : "";
+var disabledUp = (result.header.firstEntryOnPage != null && result.header.firstEntryOnPage <= 1) ? "disabled='true'" : "";
 
 document.write(
 "<button NAME='begin' onClick='doNext(this)' VALUE='|<<' width='72'>|&lt;&lt;</button>\n"+
-"<button NAME='previous' onClick='doNext(this)' VALUE='<' width='72'>&lt;</button>\n"+
+"<button "+disabledUp+" NAME='previous' onClick='doNext(this)' VALUE='<' width='72'>&lt;</button>\n"+
 "<INPUT TYPE='hidden' NAME='totalRecordCount' VALUE='"+
 result.header.totalRecordCount+ "'>\n"+
 "<INPUT TYPE='hidden' NAME='op' VALUE='"+ "queryReq"+ "'>\n"+
@@ -429,8 +431,8 @@
 
     document.write("<INPUT style='padding-left: 2px;' TYPE=text SIZE=16 NAME=maxCount VALUE='"+
 result.fixed.maxCount+ "'>\n"+
-"<button "+disabled+" NAME='next' onClick='doNext(this)' VALUE='>' width='72'>&gt;</button>\n"+
-"<button "+disabled+" NAME='end' onClick='doNext(this)' VALUE='>>|' width='72'>&gt;&gt;|</button>\n"+
+"<button "+disabledDown+" NAME='next' onClick='doNext(this)' VALUE='>' width='72'>&gt;</button>\n"+
+"<button NAME='end' onClick='doNext(this)' VALUE='>>|' width='72'>&gt;&gt;|</button>\n"+
 "</FORM>\n");
 }
 }
Index: pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/queryCert.template
===================================================================
--- pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/queryCert.template	(revision 2248)
+++ pki/dogtag/ca-ui/shared/webapps/ca/agent/ca/queryCert.template	(working copy)
@@ -463,12 +463,14 @@
 if (result.header.queryFilterHash != null) {
     document.write(renderHidden("queryFilterHash"));
 }
+var disabledDown = ((result.header.querySentinelDown == null) ||
+                    (result.fixed.maxCount > result.header.currentRecordCount) ||
+                    (result.fixed.maxCount+1 == result.header.currentRecordCount)) ? "disabled='true'" : "";
+var disabledUp = (result.header.querySentinelUp != null && result.header.querySentinelUp <= 1) ? "disabled='true'" : "";
 
-var disabled = (result.header.querySentinelDown == null) ? "disabled='true'" : "";
-
 document.write(
 "<button NAME=begin onClick='doNext(this)' VALUE='|<<' width='72'>|&lt;&lt;</button>\n"+
-"<button NAME=up onClick='doNext(this)' VALUE='<' width='72'>&lt;</button>\n"+
+"<button "+disabledUp+" NAME=up onClick='doNext(this)' VALUE='<' width='72'>&lt;</button>\n"+
 "<INPUT TYPE=hidden NAME=totalRecordCount VALUE='"+
 result.header.totalRecordCount+ "'>\n"+
 "<INPUT TYPE=hidden NAME=queryCertFilter VALUE='"+
@@ -484,8 +486,8 @@
 "<INPUT style='padding-left: 2px;' TYPE=text SIZE=16 NAME=maxCount VALUE='"+
 result.header.maxCount+ "'>\n"+
 
-"<button "+disabled+" NAME=down onClick='doNext(this)' VALUE='>' width='72'>&gt;</button>\n"+
-"<button "+disabled+" NAME=end onClick='doNext(this)' VALUE='>>|' width='72'>&gt;&gt;|</button>\n"+
+"<button "+disabledDown+" NAME=down onClick='doNext(this)' VALUE='>' width='72'>&gt;</button>\n"+
+"<button NAME=end onClick='doNext(this)' VALUE='>>|' width='72'>&gt;&gt;|</button>\n"+
 "</FORM>\n");
 }