LIB001-545: Fixing pagination on search and browse