Updated comments, moved methods and refactored URL params
Merge pull request #1461 from benjamij/search-service-update

Updated comments, moved methods and refactored URL params