diff --git a/modules/default/weather/providers/openweathermap.js b/modules/default/weather/providers/openweathermap.js
index 2cdd6d96..55e2ebfe 100755
--- a/modules/default/weather/providers/openweathermap.js
+++ b/modules/default/weather/providers/openweathermap.js
@@ -66,7 +66,7 @@ WeatherProvider.register("openweathermap", {
 					return;
 				}
 
-				this.setFetchedLocation(`(${data.lat},${data.lon})`);
+				this.setFetchedLocation(`${data.lat},${data.lon}`);
 
 				const wData = this.generateWeatherObjectsFromOnecall(data);
 				this.setWeatherData(wData);
diff --git a/modules/default/weather/weather.js b/modules/default/weather/weather.js
index 1ec7251d..574c3863 100644
--- a/modules/default/weather/weather.js
+++ b/modules/default/weather/weather.js
@@ -155,14 +155,12 @@ Module.register("weather", {
 		}
 
 		setTimeout(() => {
-			if (this.config.type === "wDataCurrent"
-			 || this.config.type === "wDataHourly"
-			 || this.config.type === "wDataDaily") {
-				this.weatherProvider.fetchWeatherData();
-			} else if (this.config.type === "forecast") {
+			if (this.config.type === "forecast") {
 				this.weatherProvider.fetchWeatherForecast();
-			} else {
+			} else if (this.config.type === "current") {
 				this.weatherProvider.fetchCurrentWeather();
+			} else {
+				this.weatherProvider.fetchWeatherData();
 			}
 		}, nextLoad);
 	},
@@ -271,7 +269,7 @@ Module.register("weather", {
 		this.nunjucksEnvironment().addFilter(
 			"calcNumEntries",
 			function (dataArray) {
-				return Math.min(dataArray.length, this.config.maxNumberOfEntries);
+				return Math.min(dataArray.length, this.config.maxEntries);
 			}.bind(this)
 		);