expanded choice fields fixed

Expanded choice fields not rendered correctly with symfony 2.3

See #1460 for more information