Fixed regex for new uri safe charaters