Merge pull request #1882 from bartcharbon/master

new equals including nestedRules
Test case for QueryImpl.equals
Merge pull request #1884 from dennishendriksen/master

Test case for QueryImpl.equals
configured labels for filters (same as filter wizard)