Add word boundary to regex