For the changes made to the data class for contacts.
{if $contact.addr2}<div class="glm-contact-info-address2">{$contact.addr2}</div>{/if}
{if $contact.zip or $contact.city.name or $contact.state.name}
<div>
- {if $contact.city.name}<span class="glm-contact-info-city">{$contact.city.name},</span>{/if}
+ {if $contact.city}<span class="glm-contact-info-city">{$contact.city},</span>{/if}
{if $contact.state.name}<span class="glm-contact-info-state">{$contact.state.name}</span>{/if}
{if $contact.zip}<span class="glm-contact-info-zip">{$contact.zip}</span>{/if}
</div>{/if}