finishing up auto-complete support