Tagged water-mitigation