Stage-2: Add ECAL FG and improve cluster filtering & sharing