Added autocomplete and phrase_matching
Merged