diff --git a/src/index.html.tmpl b/src/index.html.tmpl
index 23a0cf1..f96ff11 100644
--- a/src/index.html.tmpl
+++ b/src/index.html.tmpl
@@ -16,7 +16,7 @@
           $getVar('obs.label.' + name)
 
 
-          #if $name in $Extras.Appearance.show_trend_on and $getVar('trend.' + name + '.raw') is not None
+          #if $name in $Extras.Appearance.show_trend_on and $getVar('trend.' + name + '.raw') != None
 
             #if $getVar('trend.' + name + '.raw') > 0.1
             <i class="wi wi-direction-up-right"
@@ -149,7 +149,7 @@
       #for $x in $Extras.Appearance.values_order
 
       #if $x == "ET"
-        #if $day.ET.has_data and $day.ET.sum.raw is not None and $day.ET.sum.raw > 0.0
+        #if $day.ET.has_data and $day.ET.sum.raw != None and $day.ET.sum.raw > 0.0
           $valuesCard('ET')
         #end if
       #else
@@ -165,7 +165,7 @@
       #for $x in $Extras.Appearance.charts_order
 
       #if $x == "ET"
-        #if $day.ET.has_data and $day.ET.sum.raw is not None and $day.ET.sum.raw > 0.0
+        #if $day.ET.has_data and $day.ET.sum.raw != None and $day.ET.sum.raw > 0.0
           $chartCard($x, $x + 'chart')
         #end if
       #else
@@ -311,7 +311,7 @@ new ApexCharts(document.querySelector('#$id'), {
   $getChartJsCode("UV", "UVchart", "area", "UV", "", "max")
   #end if
 
-  #if $day.ET.has_data and $day.ET.sum.raw is not None and $day.ET.sum.raw > 0.0
+  #if $day.ET.has_data and $day.ET.sum.raw != None and $day.ET.sum.raw > 0.0
   $getChartJsCode("ET", "ETchart", "area", "ET", "", "max")
   #end if
 
diff --git a/src/month-%Y-%m.html.tmpl b/src/month-%Y-%m.html.tmpl
index 4afb10e..3c755fb 100644
--- a/src/month-%Y-%m.html.tmpl
+++ b/src/month-%Y-%m.html.tmpl
@@ -136,7 +136,7 @@
       #for $x in $Extras.Appearance.values_order
 
       #if $x == "ET"
-        #if $month.ET.has_data and $month.ET.sum.raw is not None and $month.ET.sum.raw > 0.0
+        #if $month.ET.has_data and $month.ET.sum.raw != None and $month.ET.sum.raw > 0.0
           $valuesCard('ET')
         #end if
       #else
@@ -154,7 +154,7 @@
       #for $x in $Extras.Appearance.charts_order
 
       #if $x == "ET"
-        #if $month.ET.has_data and $month.ET.sum.raw is not None and $month.ET.sum.raw > 0.0
+        #if $month.ET.has_data and $month.ET.sum.raw != None and $month.ET.sum.raw > 0.0
           $chartCard($x, $x + 'chart')
         #end if
       #else
@@ -342,7 +342,7 @@ new ApexCharts(document.querySelector('#$id'), {
   $getChartJsCode("UV", "UVchart", "area", "UV", "", "max")
   #end if
 
-  #if $month.ET.has_data and $month.ET.sum.raw is not None and $month.ET.sum.raw > 0.0
+  #if $month.ET.has_data and $month.ET.sum.raw != None and $month.ET.sum.raw > 0.0
   $getChartJsCode("ET", "ETchart", "area", "ET", "", "max")
   #end if
 
diff --git a/src/month.html.tmpl b/src/month.html.tmpl
index ef16405..03f5a23 100644
--- a/src/month.html.tmpl
+++ b/src/month.html.tmpl
@@ -131,7 +131,7 @@
       #for $x in $Extras.Appearance.values_order
 
       #if $x == "ET"
-        #if $month.ET.has_data and $month.ET.sum.raw is not None and $month.ET.sum.raw > 0.0
+        #if $month.ET.has_data and $month.ET.sum.raw != None and $month.ET.sum.raw > 0.0
           $valuesCard('ET')
         #end if
       #else
@@ -147,7 +147,7 @@
       #for $x in $Extras.Appearance.charts_order
 
       #if $x == "ET"
-        #if $month.ET.has_data and $month.ET.sum.raw is not None and $month.ET.sum.raw > 0.0
+        #if $month.ET.has_data and $month.ET.sum.raw != None and $month.ET.sum.raw > 0.0
           $chartCard($x, $x + 'chart')
         #end if
       #else
@@ -293,7 +293,7 @@ new ApexCharts(document.querySelector('#$id'), {
   $getChartJsCode("UV", "UVchart", "area", "UV", "", "max")
   #end if
 
-  #if $month.ET.has_data and $month.ET.sum.raw is not None and $month.ET.sum.raw > 0.0
+  #if $month.ET.has_data and $month.ET.sum.raw != None and $month.ET.sum.raw > 0.0
   $getChartJsCode("ET", "ETchart", "area", "ET", "", "max")
   #end if
 
diff --git a/src/week.html.tmpl b/src/week.html.tmpl
index 72cce48..17bacb7 100644
--- a/src/week.html.tmpl
+++ b/src/week.html.tmpl
@@ -131,7 +131,7 @@
       #for $x in $Extras.Appearance.values_order
 
       #if $x == "ET"
-        #if $week.ET.has_data and $week.ET.sum.raw is not None and $week.ET.sum.raw > 0.0
+        #if $week.ET.has_data and $week.ET.sum.raw != None and $week.ET.sum.raw > 0.0
           $valuesCard('ET')
         #end if
       #else
@@ -147,7 +147,7 @@
       #for $x in $Extras.Appearance.charts_order
 
       #if $x == "ET"
-        #if $week.ET.has_data and $week.ET.sum.raw is not None and $week.ET.sum.raw > 0.0
+        #if $week.ET.has_data and $week.ET.sum.raw != None and $week.ET.sum.raw > 0.0
           $chartCard($x, $x + 'chart')
         #end if
       #else
@@ -293,7 +293,7 @@ new ApexCharts(document.querySelector('#$id'), {
   $getChartJsCode("UV", "UVchart", "area", "UV", "", "max")
   #end if
 
-  #if $week.ET.has_data and $week.ET.sum.raw is not None and $week.ET.sum.raw > 0.0
+  #if $week.ET.has_data and $week.ET.sum.raw != None and $week.ET.sum.raw > 0.0
   $getChartJsCode("ET", "ETchart", "area", "ET", "", "max")
   #end if
 
diff --git a/src/year-%Y.html.tmpl b/src/year-%Y.html.tmpl
index 02a0fa8..95b7ce2 100644
--- a/src/year-%Y.html.tmpl
+++ b/src/year-%Y.html.tmpl
@@ -182,7 +182,7 @@
       #for $x in $Extras.Appearance.values_order
 
       #if $x == "ET"
-        #if $year.ET.has_data and $year.ET.sum.raw is not None and $year.ET.sum.raw > 0.0
+        #if $year.ET.has_data and $year.ET.sum.raw != None and $year.ET.sum.raw > 0.0
           $valuesCard('ET')
         #end if
       #else
@@ -198,7 +198,7 @@
       #for $x in $Extras.Appearance.charts_order
 
       #if $x == "ET"
-        #if $year.ET.has_data and $year.ET.sum.raw is not None and $year.ET.sum.raw > 0.0
+        #if $year.ET.has_data and $year.ET.sum.raw != None and $year.ET.sum.raw > 0.0
           $chartCard($x, $x + 'chart')
         #end if
       #else
@@ -386,7 +386,7 @@ new ApexCharts(document.querySelector('#$id'), {
   $getChartJsCode("UV", "UVchart", "area", "UV", "", "max")
   #end if
 
-  #if $year.ET.has_data and $year.ET.sum.raw is not None and $year.ET.sum.raw > 0.0
+  #if $year.ET.has_data and $year.ET.sum.raw != None and $year.ET.sum.raw > 0.0
   $getChartJsCode("ET", "ETchart", "area", "ET", "", "max")
   #end if
 
diff --git a/src/year.html.tmpl b/src/year.html.tmpl
index 8780a77..d423b0e 100644
--- a/src/year.html.tmpl
+++ b/src/year.html.tmpl
@@ -131,7 +131,7 @@
       #for $x in $Extras.Appearance.values_order
 
       #if $x == "ET"
-        #if $year.ET.has_data and $year.ET.sum.raw is not None and $year.ET.sum.raw > 0.0
+        #if $year.ET.has_data and $year.ET.sum.raw != None and $year.ET.sum.raw > 0.0
           $valuesCard('ET')
         #end if
       #else
@@ -147,7 +147,7 @@
       #for $x in $Extras.Appearance.charts_order
 
       #if $x == "ET"
-        #if $year.ET.has_data and $year.ET.sum.raw is not None and $year.ET.sum.raw > 0.0
+        #if $year.ET.has_data and $year.ET.sum.raw != None and $year.ET.sum.raw > 0.0
           $chartCard($x, $x + 'chart')
         #end if
       #else
@@ -340,7 +340,7 @@ new ApexCharts(document.querySelector('#$id'), {
   $getChartJsCode("UV", "UVchart", "area", "UV", "", "max")
   #end if
 
-  #if $year.ET.has_data and $year.ET.sum.raw is not None and $year.ET.sum.raw > 0.0
+  #if $year.ET.has_data and $year.ET.sum.raw != None and $year.ET.sum.raw > 0.0
   $getChartJsCode("ET", "ETchart", "area", "ET", "", "max")
   #end if
 
diff --git a/src/yesterday.html.tmpl b/src/yesterday.html.tmpl
index 3c52540..7458ddc 100644
--- a/src/yesterday.html.tmpl
+++ b/src/yesterday.html.tmpl
@@ -130,7 +130,7 @@
       #for $x in $Extras.Appearance.values_order
 
       #if $x == "ET"
-        #if $yesterday.ET.has_data and $yesterday.ET.sum.raw is not None and $yesterday.ET.sum.raw > 0.0
+        #if $yesterday.ET.has_data and $yesterday.ET.sum.raw != None and $yesterday.ET.sum.raw > 0.0
           $valuesCard('ET')
         #end if
       #else
@@ -146,7 +146,7 @@
       #for $x in $Extras.Appearance.charts_order
 
       #if $x == "ET"
-        #if $yesterday.ET.has_data and $yesterday.ET.sum.raw is not None and $yesterday.ET.sum.raw > 0.0
+        #if $yesterday.ET.has_data and $yesterday.ET.sum.raw != None and $yesterday.ET.sum.raw > 0.0
           $chartCard($x, $x + 'chart')
         #end if
       #else
@@ -316,7 +316,7 @@ new ApexCharts(document.querySelector('#$id'), {
   $getChartJsCode("UV", "UVchart", "area", "UV", "", "max")
   #end if
 
-  #if $yesterday.ET.has_data and $yesterday.ET.sum.raw is not None and $yesterday.ET.sum.raw > 0.0
+  #if $yesterday.ET.has_data and $yesterday.ET.sum.raw != None and $yesterday.ET.sum.raw > 0.0
   $getChartJsCode("ET", "ETchart", "area", "ET", "", "max")
   #end if