Tweaked starting state autoselect