more work on 1481: adding back drop-downs for