Fix autocompletion

[Fixes](http://teampulse.telerik.com/view#item/267279)
@tailsu @teobugslayer @Fatme