Added query echoing