7/30 category and org filter done