Fix saving of top level subjects.