Add the option to only return the matching parts