Fixed bugs from revert.

Question Sounds and Images works again