Integrate (badly) paging and limiting
Fix borked list