reverted removal of search pagination
Merge branch 'develop' into testing