Tweaks for Customers with display_name
Tweaks for Vendors with display_name