oreDictHandler updates
fixes #247, fixes #248