[Weather Metrics]Bugs fix