Tagged gas-pump-restoration