Fix autocompletion for items in folders
Merge pull request #1124 from daniel-beck/fix-autocompletion-for-folders

Fix autocompletion for items in folders