fixed add choices/questions