fixed QueryGenerator for EDataType support