Continue working on include filter