Fixed bug
Merge pull request #145 from if045/YM-tech

fix bug with search logic+pagination
Fixed critical bug
Merge pull request #146 from if045/RS-tech

Rs tech
fixng bugs with search+pagination logic