This seems a bit inconvenient. Shouldn't we be able to extract these options from the query object?