Quotes added and field indication set back to original method