--- a/libervia/server/pages.py	Fri Jun 19 16:47:51 2020 +0200
+++ b/libervia/server/pages.py	Thu Jul 16 09:08:47 2020 +0200
@@ -954,16 +954,17 @@
         """
         template_data = request.template_data
         try:
-            last_id = pubsub_data["rsm_last"]
+            rsm = pubsub_data["rsm"]
+            last_id = rsm["last"]
         except KeyError:
             # no pagination available
             return
 
-        if pubsub_data.get("rsm_index", 1) > 0:
+        if rsm.get("index", 1) > 0:
             # We only show previous button if it's not the first page already.
             # If we have no index, we default to display the button anyway
             # as we can't know if we are on the first page or not.
-            first_id = pubsub_data["rsm_first"]
+            first_id = rsm["first"]
             template_data['previous_page_url'] = self.getParamURL(request,
                                                                   before=first_id)
         if not pubsub_data["complete"]: