More fixes

Fxed adding and editing of properties which was crashing Map