further pagination tweaks