Add support for on-demand filtering mode (needs to be set before used)