Added support for origin filter