fix all issues with merging of properties for class suggestions