add/scoping of auto-complete