added subject filtering