Added search button
Performance improved
Merge branch 'master' into testing