AdditionalSearch widget and related refactoring

Closes #252