Add word boundaries to regex