Fix completions not working past first letter
Remove hack
Merge branch 'feature/fix-completions' into develop