toDropdownMap() replaced for map()