Update select dropdown output - do not try to use null value as selected
Update select dropdown output - do not try to use zero value as selected
Merge pull request #2460 from mattheu/fix-null-selected

Update select dropdown output - do not try to use null value as selected