In the contex of SPARK-1337: Make sure that all metadata fields are properly cleaned