Fix a backward compatibility issue and a notice when saving with no tags