Adding back in part that uses hub if it exists
Adding highlighting of currently selected autocomplete option