Added query-option