fix option keys to be more correct