Change: allowed whitespaces in the keys (but still not in the ID)