Moved name search to service