Support for custom data queries on export