fix -whs mapping and save