refactored find_by_service and specs