More example fixes due to Query API changes