Put optional filter inside optional graph pattern.
Add support for disjunctive type filter.