Improvements to filtering and displaying charts

[#70174498 #76618078 #55519396]