Smarter handling of punctation inside same string check