Add polygon drawing per cluster by default --kazu