Implement filters for #984