Search and paging

Change log:
- search now works better
- paging is now working properly