Added support for filters, including route-specific