fixed excessive commands
improved cluster_mapping updating