fix query with subs for Stacia/xyz team teach