Faceting when, binding providers & other refactors on filters