added et-dto
merge on et-dto
work on et-dto
work on querywid fix