AdditionalSearch widget and related refactoring