NEON-1065 Adding Point/Cluster toggle.