MOTM-2: Data ingest for Weather Service
format fixes