Fixed issue #9 and autocompletion on main search field