Resolved circular dependency between ui <=> ui.search