Filtering and charting fixes