Fix changing timezones when filling map