make search and pagination better usable
remove unused codes