Adjusted the Repository Query to be more generic and flexible
Added paging to the page selector