Add word boundaries to protect against aggressive word matches