Improvements in FilterBuilderViewModel