adding more testing and switching over to shared SearchService for search functionality