No longer output empty tags when the corresponding property is not set