CSW: fix and improve default mappings