Added in more escaping for underscores