Unescape some entities
Beginnings of an integration test for the questionnaire editor
Make labels consistently match the appropriate element in questionnaire editor and beyond