Bug fix for e/p mode such that we don't attach multiple clusters corresponding to the same cluster to charged PFO