Small fixes, and better support for translations in survey entity