Updating AnnotationMatcher to handle text matches, with properly shifted
offsets