Fix queries with new target