Refactor searchable widget