improve property type edit and remove