Merge pull request #190 from CruGlobal/dev

Fix Search Pagination
Merge pull request #195 from CruGlobal/dev

Dev