Added query tips and document return format