Improve code for Guideline and PlotSelection