Update query-related code