some fixes to make sure {#each} contains one-and-only-one element
Merge branch 'develop'