Editor now support multi geometry. Bugs and fixes