Implemented better search
Implemented better search
Merge branch 'feature/better-search'