Fixing pagination on search and browse