better auto-complete