* minor string modification
* minor string modification
* minor string modification
* Added the simplest validation of the search input
* Minor refactoring