MODE-2329 Fixed the handling of expanded form selector names for the query engine.