Changed values escaping