- applied changes to CDO query interface