20210618 city.goa: Goa: 'Calangute belt water supply to improve'