Drop down list populated
Updated code that was lost in merge
Merged upstream