fix gh-213
gh-213 (items used in %): review fixes
Merge branch 'fix-gh-213-v2'