Initial query support for export