Cleaned up CC annotation greatly: Only entire words can match, and the annotated text span actually corresponds to the match now