Fix issues with highlighting by label and with overwritten plots
Fix issues with highlighting by label and with overwritten plots