More consistent behavior of select checking steps