Improved search functionality
code cleanup
Merge branch 'autocomplete'