updated query to properly join services and opportunity tables