Added support for domain filter