fix option handling to be aware of multi-lingual strings