diff --git a/rowers/dataprep.py b/rowers/dataprep.py
index 026fa09a..62f5b805 100644
--- a/rowers/dataprep.py
+++ b/rowers/dataprep.py
@@ -1621,7 +1621,20 @@ def get_existing_job(w):
 def workout_trimp(w, reset=False):
     r = w.user
 
-    if w.trimp > -1 and not reset:
+    if w.trimp <= 0 and w.averagehr > 0:
+        ftp = float(r.ftp)
+        _ = myqueue(
+            queuehigh,
+            handle_calctrimp,
+            w.id,
+            w.csvfilename,
+            ftp,
+            r.sex,
+            r.hrftp,
+            r.max,
+            r.rest)
+        return w.trimp, w.hrtss
+    elif w.trimp > -1 and not reset:
         return w.trimp, w.hrtss
 
     if get_existing_job(w):
diff --git a/rowers/views/analysisviews.py b/rowers/views/analysisviews.py
index 7793ae1d..46366473 100644
--- a/rowers/views/analysisviews.py
+++ b/rowers/views/analysisviews.py
@@ -2105,7 +2105,7 @@ class SavedAnalysisView(UserPassesTestMixin, View):
             self.searchform = SearchForm(initial={'q': query})
         date_initial = {}
         if startdate:
-            self.analyses = self.analyses.filter(date__gte=startdate)
+            self.analyses = self.analyses.filter(date__gte=startdate)                
             date_initial['startdate'] = startdate
         if enddate:
             self.analyses = self.analyses.filter(date__lte=enddate)