fix for convertfromdriformatenhanced and syntax fixes in et-query