WCMS-214 Tweaks to Catalogs.