Added paging on matches