closes #1676
Merge pull request #1880 from dotCMS/issue-1676-key-value-badness

closes #1676