Feature/239 autocompletion improvements - fix #239