fix duplicate/wrong id_property issues
Merge pull request #486 from subvertallchris/master

fix duplicate/wrong id_property issues