diff --git a/CHANGELOG.md b/CHANGELOG.md
index fb8d9fcba..3138b06cc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ This project adheres to [Semantic Versioning](https://semver.org/).
 - [#372](https://github.com/equinor/flownet/pull/372) Added option to let the additional flownodes initially be placed within the original volume rather than within the convex hull of the real wells. To do this set place_nodes_in_volume_reservoir to true.
 
 ### Fixes
+- [#391](https://github.com/equinor/flownet/pull/391) Fixes bug in generation of yaml files for visualization in Webviz.
 - [#372](https://github.com/equinor/flownet/pull/372) Fixes bug of hull_factor not actually being used for placing additional nodes outside the perforations.
 - [#374](https://github.com/equinor/flownet/pull/374) Fix for memory leak in result plotting script.
 
diff --git a/src/flownet/templates/observations.ertobs.jinja2 b/src/flownet/templates/observations.ertobs.jinja2
index cc58e7d44..57fc400d3 100644
--- a/src/flownet/templates/observations.ertobs.jinja2
+++ b/src/flownet/templates/observations.ertobs.jinja2
@@ -56,7 +56,7 @@ SUMMARY_OBSERVATION WWIR_{{ kw.well_name }}_{{ index_name }} { VALUE = {{ kw.rat
 SUMMARY_OBSERVATION WGIT_{{ kw.well_name }}_{{ index_name }} { VALUE = {{ kw.total }}; ERROR = {{ [error_config.WGIT.rel_error * kw.total, error_config.WGIT.min_error] | max }}; DATE = {{ date_formatted  }}; KEY = WGIT:{{ kw.well_name }}; };
 {%- endif %}
 {%- if not isnan(kw.total) and kw.inj_type == "WATER" and error_config.WWIT.rel_error is not none and error_config.WWIT.min_error is not none: %}
-SUMMARY_OBSERVATION WWIR_{{ kw.well_name }}_{{ index_name }} { VALUE = {{ kw.total }}; ERROR = {{ [error_config.WWIT.rel_error * kw.total, error_config.WWIT.min_error] | max }}; DATE = {{ date_formatted  }}; KEY = WWIT:{{ kw.well_name }}; };
+SUMMARY_OBSERVATION WWIT_{{ kw.well_name }}_{{ index_name }} { VALUE = {{ kw.total }}; ERROR = {{ [error_config.WWIT.rel_error * kw.total, error_config.WWIT.min_error] | max }}; DATE = {{ date_formatted  }}; KEY = WWIT:{{ kw.well_name }}; };
 {%- endif %}
 
 {% endfor %}
diff --git a/src/flownet/templates/observations.yamlobs.jinja2 b/src/flownet/templates/observations.yamlobs.jinja2
index 1bf8a8ef0..35569132c 100644
--- a/src/flownet/templates/observations.yamlobs.jinja2
+++ b/src/flownet/templates/observations.yamlobs.jinja2
@@ -174,7 +174,7 @@ smry:
    {%- endfor %}
    {%- endif -%}
    {%- if (error_config.WGIR.rel_error is not none) and (error_config.WGIR.min_error is not none) -%}
-   {%- for kw in schedule.get_keywords(kw_class="WCONINJH", well_name=well_name, ignore_nan="thp", dates=dates[num_beginning_date:num_end_date]) -%}
+   {%- for kw in schedule.get_keywords(kw_class="WCONINJH", well_name=well_name, ignore_nan="rate", dates=dates[num_beginning_date:num_end_date]) if kw.inj_type == "GAS" -%}
    {% if loop.first and not loop.last: %}
  - key: WGIR:{{ well_name }}
    observations:
@@ -191,7 +191,7 @@ smry:
    {%- endfor %}
    {%- endif -%}
    {%- if (error_config.WWIR.rel_error is not none) and (error_config.WWIR.min_error is not none) -%}
-   {%- for kw in schedule.get_keywords(kw_class="WCONINJH", well_name=well_name, ignore_nan="thp", dates=dates[num_beginning_date:num_end_date]) -%}
+   {%- for kw in schedule.get_keywords(kw_class="WCONINJH", well_name=well_name, ignore_nan="rate", dates=dates[num_beginning_date:num_end_date]) if kw.inj_type == "WATER" -%}
    {% if loop.first and not loop.last: %}
  - key: WWIR:{{ well_name }}
    observations:
@@ -208,7 +208,7 @@ smry:
    {%- endfor %}
    {%- endif -%}
    {%- if (error_config.WGIT.rel_error is not none) and (error_config.WGIT.min_error is not none) -%}
-   {%- for kw in schedule.get_keywords(kw_class="WCONINJH", well_name=well_name, ignore_nan="thp", dates=dates[num_beginning_date:num_end_date]) -%}
+   {%- for kw in schedule.get_keywords(kw_class="WCONINJH", well_name=well_name, ignore_nan="total", dates=dates[num_beginning_date:num_end_date]) if kw.inj_type == "GAS" -%}
    {% if loop.first and not loop.last: %}
  - key: WGIT:{{ well_name }}
    observations:
@@ -225,7 +225,7 @@ smry:
    {%- endfor %}
    {%- endif -%}
    {%- if (error_config.WWIT.rel_error is not none) and (error_config.WWIT.min_error is not none) -%}
-   {%- for kw in schedule.get_keywords(kw_class="WCONINJH", well_name=well_name, ignore_nan="thp", dates=dates[num_beginning_date:num_end_date]) -%}
+   {%- for kw in schedule.get_keywords(kw_class="WCONINJH", well_name=well_name, ignore_nan="total", dates=dates[num_beginning_date:num_end_date]) if kw.inj_type == "WATER" -%}
    {% if loop.first and not loop.last: %}
  - key: WWIT:{{ well_name }}
    observations: