diff --git a/app/models.py b/app/models.py
index 5320c980bd9a6f7ad487b078fbab6818c616fc33..0f21d86671afa066f379430d2fd6a0734ed544c2 100644
--- a/app/models.py
+++ b/app/models.py
@@ -16,7 +16,6 @@
 #    along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
 from datetime import datetime
-from _datetime import date
 
 from shapely import wkb
 from shapely.geometry import Point
diff --git a/app/weatherdata_utils.py b/app/weatherdata_utils.py
index 8ed9445336746492f287d03e462bee6c25515e7c..ef27e869784a9a471c58103d468ebbd76af55d56 100644
--- a/app/weatherdata_utils.py
+++ b/app/weatherdata_utils.py
@@ -7,14 +7,14 @@ from models import WeatherData
 def filter_period(weather_data, time_start, time_end):
     # Get the start and end index
     #print(time_start)
-    start_index = weather_data.get_index_from_epoch_seconds(WeatherData.to_epoch_seconds(time_start))
+    start_index = max(0,weather_data.get_index_from_epoch_seconds(WeatherData.to_epoch_seconds(time_start)))
     #print(start_index)
-    end_index = weather_data.get_index_from_epoch_seconds(WeatherData.to_epoch_seconds(time_end))
+    end_index = min(weather_data.get_index_from_epoch_seconds(weather_data.timeEnd), weather_data.get_index_from_epoch_seconds(WeatherData.to_epoch_seconds(time_end)))
     for lwd in weather_data.locationWeatherData:
         lwd.data = lwd.data[start_index:end_index]
     # Adjust timeStart and timeEnd
-    weather_data.timeStart = WeatherData.to_epoch_seconds(time_start)
-    weather_data.timeEnd = WeatherData.to_epoch_seconds(time_end)
+    weather_data.timeStart = weather_data.timeStart + (start_index * weather_data.interval)
+    weather_data.timeEnd = weather_data.timeStart + (end_index * weather_data.interval)
     return weather_data
 
 def filter_params(weather_data, params):