Adjusted the current filtering mechanism to allow us to take control of the results set for pagination.