Added matched_subentities_only option