correct keys feedback and improved graph show/hide data collection