Fix clusterizer bug in heuristic 1 and disable optimized heuristic 2.