Tweaks to eliminate duplicates in some charts