Merge "Fix tag sorting in PlotWalk"