Refactoring of search widget proposal