Added paging + improved search