CACO-5840 Some minor tweaks for making Google Merchant happy with our feeds.