Add logic for word count and content_no_punc