a few more updates to autocomplete suggestions
Merge branch 'develop'