improve selection expansion and goto line