Modified query for active services