added pagination and filter on category