Two fixes for bugs with saving taxonomies: Save empty sets, and added sanity check for mismatching key-name pairs in taxonomy.yml