feat(query-engine): use @map'd values of enum in query input and output

feat(query-engine): use @map'd values of enum in query input and output #2342