Flesh out the instance filters a bit more