fix bug with search logic+pagination
Merge pull request #145 from if045/YM-tech

fix bug with search logic+pagination