Minor refactoring
Custom Search API with input form now working.