MODE-2329 Fixed the handling of expanded form selector names for the query engine.
Merge pull request #1308 from hchiorean/MODE-2329

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