Smart selection of text mapping
Revert "OptionalMapping fix: spaces in optional fields"

This reverts commit 74cdb921a2508ce0809dda913da9b804f969caa0.
cleanup after revert