Make sure the attribute label is always filtered
Merge pull request #844 from dgwatkins/dev

Make sure the attribute label is always filtered
update for version 1.7