Fixing AddCommodityTroughEANForm and #18