@thyms improved dropdown key value pair structure.