Moving Search functionality into SearchService