Add optional wrapper to filters so that they can have more fancy styles & add support for on-demand filtering mode