update getPropertyValue to work correctly with all ODM cases