finished both query team and service