MODE-1820: Query