Fixed: expanded properties were not removed during save