VE-1393 Updating the UI mapping for the new dropdown