Add termNameCollision lookup
Improve selection expansion