updated wizard queries