[merge after 32] Allow for multiple question types