Added attribute value escaping