Add filter for kind