fix duplicate/wrong id_property issues