diff --git a/app/bundles/LeadBundle/Resources/views/Company/list_rows_contacts.html.twig b/app/bundles/LeadBundle/Resources/views/Company/list_rows_contacts.html.twig
index ebdf6a83adb..5ef839555eb 100644
--- a/app/bundles/LeadBundle/Resources/views/Company/list_rows_contacts.html.twig
+++ b/app/bundles/LeadBundle/Resources/views/Company/list_rows_contacts.html.twig
@@ -167,7 +167,7 @@
                             }]) %}
                         {% endif %}
 
-                        {% if fields.core.email.value is not empty %}
+                        {% if fields.core.email is defined %}
                             {% set custom = custom|merge([{
                                 'attr': {
                                     'data-toggle': 'ajaxmodal',
@@ -198,17 +198,17 @@
                     </td>
                     <td class="visible-md visible-lg">{{ fields.core.email.value|purify }}</td>
                     <td class="visible-md visible-lg">
-                        {% set flag = fields.core.country is not empty and fields.core.country.value is not empty ? assetGetCountryFlag(fields.core.country.value) : '' %}
+                        {% set flag = fields.core.country is defined and fields.core.country.value is not empty ? assetGetCountryFlag(fields.core.country.value) : '' %}
                         {% if flag is not empty %}
                           <img src="{{ flag }}" style="max-height: 24px;" class="mr-sm" />
                         {% endif %}
                         {% set location = [] %}
-                        {% if fields.core.city.value is not empty %}
+                        {% if fields.core.city is defined %}
                             {% set location = location|merge([fields.core.city.value]) %}
                         {% endif %}
-                        {% if fields.core.state.value is not empty %}
+                        {% if fields.core.state is defined %}
                             {% set location = location|merge([fields.core.state.value]) %}
-                        {% elseif fields.core.country.value is not empty %}
+                        {% elseif fields.core.country is defined %}
                             {% set location = location|merge([fields.core.country.value]) %}
                         {% endif %}
                         {{ location|join(', ') }}
diff --git a/app/bundles/LeadBundle/Resources/views/Lead/_list_column_location.html.twig b/app/bundles/LeadBundle/Resources/views/Lead/_list_column_location.html.twig
index 9454a952a3c..1be61231d74 100644
--- a/app/bundles/LeadBundle/Resources/views/Lead/_list_column_location.html.twig
+++ b/app/bundles/LeadBundle/Resources/views/Lead/_list_column_location.html.twig
@@ -1,16 +1,16 @@
 <td class="{{ class }}">
-    {% set flag = fields.core.country.value is not null ? assetGetCountryFlag(fields.core.country.value) : '' %}
+    {% set flag = fields.core.country is defined and fields.core.country.value is not empty ? assetGetCountryFlag(fields.core.country.value) : '' %}
     {% if flag is not empty %}
         <img src="{{ flag }}" style="max-height: 24px;" class="mr-sm" />
     {% endif %}
 
     {% set location = [] %}
-    {% if fields.core.city.value is not empty %}
+    {% if fields.core.city is defined %}
         {% set location = location|merge([fields.core.city.value]) %}
     {% endif %}
-    {% if fields.core.state.value is not empty %}
+    {% if fields.core.state is defined %}
         {% set location = location|merge([fields.core.state.value]) %}
-    {% elseif fields.core.country.value is not empty %}
+    {% elseif fields.core.country is defined %}
         {% set location = location|merge([fields.core.country.value]) %}
     {% endif %}
     {{ location|join(', ')|purify }}
diff --git a/app/bundles/LeadBundle/Resources/views/Lead/grid_card.html.twig b/app/bundles/LeadBundle/Resources/views/Lead/grid_card.html.twig
index dd4eb8cd999..3adcef7d2fb 100644
--- a/app/bundles/LeadBundle/Resources/views/Lead/grid_card.html.twig
+++ b/app/bundles/LeadBundle/Resources/views/Lead/grid_card.html.twig
@@ -32,12 +32,12 @@
                     <div class="text-muted mb-1 ellipsis">
                         <i class="fa fa-fw fa-map-marker mr-xs"></i>
                         {% set location = [] %}
-                        {% if fields.core.city.value is not empty %}
+                        {% if fields.core.city is defined %}
                           {% set location = location|merge([fields.core.city.value]) %}
                         {% endif %}
-                        {% if fields.core.state.value is not empty %}
+                        {% if fields.core.state is defined %}
                           {% set location = location|merge([fields.core.state.value]) %}
-                        {% elseif fields.core.country.value is not empty %}
+                        {% elseif fields.core.country is defined %}
                           {% set location = location|merge([fields.core.country.value]) %}
                         {% endif %}
                         {{ location|join(', ') }}
@@ -45,7 +45,7 @@
                     <div class="text-muted mb-1 ellipsis">
                         <i class="fa fa-fw fa-globe mr-xs"></i>{{ fields.core.country.value|default('') }}
                     </div>
-                    {% set flag = fields.core.country.value is not null ? assetGetCountryFlag(fields.core.country.value) : '' %}
+                    {% set flag = fields.core.country is defined and fields.core.country.value is not empty ? assetGetCountryFlag(fields.core.country.value) : '' %}
                     {% if flag is not empty %}
                         <div style="position: absolute; right: 30px; bottom: 30px">
                             <img src="{{ flag }}" style="max-height: 24px;" class="ml-sm" />
diff --git a/app/bundles/LeadBundle/Resources/views/Lead/lead.html.twig b/app/bundles/LeadBundle/Resources/views/Lead/lead.html.twig
index 4ab200fe370..9111c387f56 100644
--- a/app/bundles/LeadBundle/Resources/views/Lead/lead.html.twig
+++ b/app/bundles/LeadBundle/Resources/views/Lead/lead.html.twig
@@ -15,7 +15,7 @@
   {% endif %}
 {% endset %}
 
-{% set flag = fields.core.country.value is not null ? assetGetCountryFlag(fields.core.country.value) : '' %}
+{% set flag = fields.core.country is defined and fields.core.country.value is not empty ? assetGetCountryFlag(fields.core.country.value) : '' %}
 {% set groups = fields|keys %}
 
 {% block headerTitle %}
@@ -28,7 +28,7 @@
     {% set buttons = [] %}
 
     {# Send email button #}
-    {% if fields.core.email.value is not empty %}
+    {% if fields.core.email is defined %}
       {% set buttons = buttons|merge([{
           'attr': {
               'id': 'sendEmailButton',
@@ -428,7 +428,7 @@
                 </h6>
                 <address class="text-muted">
                     {% if fields.core.address1 is defined %}{{ fields.core.address1.value|purify }}<br>{% endif %}
-                    {% if fields.core.address2.value is not empty %}{{ fields.core.address2.value|purify }}<br>{% endif %}
+                    {% if fields.core.address2 is defined %}{{ fields.core.address2.value|purify }}<br>{% endif %}
                     {{ lead.location|purify }}
                     {% if fields.core.zipcode is defined %}{{ fields.core.zipcode.value|purify }}{% endif %}
                     <br>