Questions.xml performance update