Overhauled filtering and pagination