pagination improvements
+local data support