Auto-complete Enhancement