Improvements to how automation point selection is done.