refactor omnibox