tweak mapping for xforms
merge with case-integrity