diff --git a/rendercv/themes/classic/EducationEntry.j2.tex b/rendercv/themes/classic/EducationEntry.j2.tex
index 15e42cc..25d0d78 100644
--- a/rendercv/themes/classic/EducationEntry.j2.tex
+++ b/rendercv/themes/classic/EducationEntry.j2.tex
@@ -23,7 +23,7 @@
     &
     \textbf{<<entry.institution>>}, <<entry.area>>
 
-((* if entry.highlights != "" *))
+((* if entry.highlights *))
     \vspace{<<design.margins.highlights_area.top>>}
 ((* endif *))
 
diff --git a/rendercv/themes/classic/PublicationEntry.j2.tex b/rendercv/themes/classic/PublicationEntry.j2.tex
index 4862e85..f2204d6 100644
--- a/rendercv/themes/classic/PublicationEntry.j2.tex
+++ b/rendercv/themes/classic/PublicationEntry.j2.tex
@@ -12,18 +12,18 @@
     \vspace{<<design.margins.highlights_area.vertical_between_bullet_points>>}
 
     <<entry.authors|map("make_it_nolinebreak")|join(", ")>>
-    ((* if entry.doi != "" or entry.journal != "" *))
+    ((* if entry.doi or entry.journal *))
     \vspace{<<design.margins.highlights_area.vertical_between_bullet_points>>}
 
     ((* endif *))
-    ((* if entry.doi != "" -*))
+    ((* if entry.doi -*))
     \href{<<entry.doi_url>>}{<<entry.doi>>}
     ((*- endif -*))
-    ((*- if entry.doi != "" and entry.journal != "" *)) (((* endif -*))
-    ((*- if entry.journal != "" -*))
+    ((*- if entry.doi and entry.journal *)) (((* endif -*))
+    ((*- if entry.journal -*))
     <<entry.journal>>
     ((*- endif -*))
-    ((*- if entry.doi != "" and entry.journal != "" *)))((* endif -*))
+    ((*- if entry.doi and entry.journal *)))((* endif -*))
     &
     <<entry.date_string>>
 \end{tabularx}
diff --git a/rendercv/themes/engineeringresumes/PublicationEntry.j2.tex b/rendercv/themes/engineeringresumes/PublicationEntry.j2.tex
index b27aea1..4276ec6 100644
--- a/rendercv/themes/engineeringresumes/PublicationEntry.j2.tex
+++ b/rendercv/themes/engineeringresumes/PublicationEntry.j2.tex
@@ -5,13 +5,13 @@
 \textbf{<<entry.title>>} -- <<entry.date_string>>
 \begin{highlights}
     \item <<entry.authors|map("make_it_nolinebreak")|join(", ")>>
-    ((*- if entry.doi != "" and entry.journal != "" *)) \item ((* endif -*))
-    ((*- if entry.doi != "" -*))
+    ((*- if entry.doi and entry.journal *)) \item ((* endif -*))
+    ((*- if entry.doi -*))
     \href{<<entry.doi_url>>}{<<entry.doi>>}
     ((*- endif -*))
-    ((*- if entry.doi != "" and entry.journal != "" *)) (((* endif -*))
-    ((*- if entry.journal != "" -*))
+    ((*- if entry.doi and entry.journal *)) (((* endif -*))
+    ((*- if entry.journal -*))
     <<entry.journal>>
     ((*- endif -*))
-    ((*- if entry.doi != "" and entry.journal != "" *)))((* endif -*))
+    ((*- if entry.doi and entry.journal *)))((* endif -*))
 \end{highlights}
diff --git a/rendercv/themes/moderncv/EducationEntry.j2.tex b/rendercv/themes/moderncv/EducationEntry.j2.tex
index 2ba4c34..da0bb9b 100644
--- a/rendercv/themes/moderncv/EducationEntry.j2.tex
+++ b/rendercv/themes/moderncv/EducationEntry.j2.tex
@@ -1,7 +1,7 @@
 \cventry{
     ((*- if design.show_only_years *))<<-entry.date_string_only_years->>((* else *))<<-entry.date_string->>((* endif -*))
 }{\textbf{<<entry.institution>>}}{
-((*- if entry.degree != "" *))<<entry.degree>> in ((* endif *))<<entry.area->>
+((*- if entry.degree *))<<entry.degree>> in ((* endif *))<<entry.area->>
 }{
     <<-entry.location->>
 }{}{}
diff --git a/rendercv/themes/moderncv/PublicationEntry.j2.tex b/rendercv/themes/moderncv/PublicationEntry.j2.tex
index 90ba510..72a2c4c 100644
--- a/rendercv/themes/moderncv/PublicationEntry.j2.tex
+++ b/rendercv/themes/moderncv/PublicationEntry.j2.tex
@@ -3,6 +3,6 @@
 }{\textbf{<<entry.title>>}}{
     <<-entry.journal->>
 }{
-((*- if entry.doi != "" -*))\href{<<entry.doi_url>>}{<<entry.doi>>}((*- endif -*))
+((*- if entry.doi -*))\href{<<entry.doi_url>>}{<<entry.doi>>}((*- endif -*))
 }{}{}
 \cvline{}{\small <<entry.authors|map("make_it_nolinebreak")|join(", ")>>}
\ No newline at end of file
diff --git a/rendercv/themes/sb2nov/PublicationEntry.j2.tex b/rendercv/themes/sb2nov/PublicationEntry.j2.tex
index 375612c..e13538d 100644
--- a/rendercv/themes/sb2nov/PublicationEntry.j2.tex
+++ b/rendercv/themes/sb2nov/PublicationEntry.j2.tex
@@ -4,14 +4,14 @@
     \textit{<<entry.date_string>>}
 }
 {
-    ((*- if entry.doi != "" -*))
+    ((*- if entry.doi -*))
     \small\textit{\href{<<entry.doi_url>>}{<<entry.doi>>}}
     ((*- endif -*))
-    ((*- if entry.doi != "" and entry.journal != "" *)) (((* endif -*))
-    ((*- if entry.journal != "" -*))
+    ((*- if entry.doi and entry.journal *)) (((* endif -*))
+    ((*- if entry.journal -*))
     \small\textit{<<entry.journal>>}
     ((*- endif -*))
-    ((*- if entry.doi != "" and entry.journal != "" *)))((* endif -*))
+    ((*- if entry.doi and entry.journal *)))((* endif -*))
 }
 \resumeItemListStart
     \resumeItem{}{\raggedright <<entry.authors|map("make_it_nolinebreak")|join(", ")>> \par}