more explicit filter/handler matching