Refactor imports, remove 'search string' is empty from email