make search and pagination better usable