Fixes #503: broker filter builder in styler
Merge pull request #504 from mbarto/filter_builder_fixes

Fixes #503: broker filter builder in styler