Fixes and improvements regarding pagination and category filters