replacing current et-query with Rogers version from propertyEditor