WIP, playing with getting multiple search types
Autocomplete refactoring
Merge branch 'master' into omnibar