Rework drop down field - git fix #59