ExternalQuery moved to external api