added pagination and date filtering