Added "noescape" to all query fields