Improve plot selection

Closes #1982 (closed)

This MR fixes sequence of scans resulting on a wrong axis selection.

This fix is kind of ad hoc solution, it would be good to rewrite it for the 1.7 release.