Tagged thermal-energy-storage