Gis map bugfixes and aggrupate node states