added kind/type to conditional
added kind/type to filter