some queries altered