Query server

Could we let `query_type='mixed'` be the default, so that e.g., the happy path tests test both query types?