changed implementation of TypeDef expression evaluation
fixed emap.xtext: support for multiple custom queries