fix option value handling
fix use of map()