4070 Bookmark filter labels and inputs not associated
Merge pull request #1786 from sarken/issue_4070

4070 Bookmark filter labels and inputs not associated