Fix OTR whitespace tag detection to prevent false positives

Fix OTR whitespace tag detection to prevent false positives #1592