Importing of attribute map no longer broken by whitespace in attribute/value names.