isolated changes made in feature/SearchInputField