Improvements to FilterBuilder when filters are loaded after the view model is available