updated search method
Merge branch 'parser'