fixed bug
solved merge conflicts
Merge pull request #425 from massiveart/feature/typeahead-update

fixed auto insert issue with new typeahead