diff --git a/templates/named.conf.generator.j2 b/templates/named.conf.generator.j2
index 70e3d0e..df107a6 100644
--- a/templates/named.conf.generator.j2
+++ b/templates/named.conf.generator.j2
@@ -1,4 +1,4 @@
-{% import 'named.conf.functions.j2' as functions %}
+{% import 'named.conf.functions.j2' as functions with context %}
 {{ ansible_managed | comment }}
 {% if item.options is defined and item.options %}
 {% from 'named.conf.options.j2' import options with context %}
@@ -51,7 +51,7 @@ options {
 {% endif %}
 {% if item.parental_agents is defined and item.parental_agents %}
 {% from 'named.conf.parental-agents.j2' import parental_agents with context %}
-{{ parental_agents(item.parental_agents) }}
+{{ parental_agents(item.parental_agents) -}}
 {% endif %}
 {% if item.server is defined and item.server %}
 {% from 'named.conf.server.j2' import server with context %}
@@ -76,4 +76,4 @@ options {
 {% if item.view is defined and item.view %}
 {% from 'named.conf.view.j2' import view with context %}
 {{ view(item.view) }}
-{% endif %}
\ No newline at end of file
+{% endif %}
diff --git a/templates/named.conf.options.j2 b/templates/named.conf.options.j2
index 48a3d93..68f85eb 100644
--- a/templates/named.conf.options.j2
+++ b/templates/named.conf.options.j2
@@ -2,7 +2,7 @@
 {# Unicorn Options#}
 {% if option.rrset_order is defined and option.rrset_order %}
 rrset-order {
-{% filter indent(bind9_config_indent*2, true) %}
+{% filter indent(bind9_config_indent, true) %}
 {% for rrset in option.rrset_order %}
 {{ ('class ' + rrset.class | string + ' ') if rrset.class is defined and rrset.class -}}
 {{ ('type ' + rrset.type | string + ' ') if rrset.type is defined and rrset.type -}}
@@ -38,7 +38,7 @@ response-policy {
 {{- (' nsip-enable ' + functions.named_boolean(option.response_policy.nsip_enable)) if option.response_policy.nsip_enable is defined -}}
 {{- (' nsdname-enable ' + functions.named_boolean(option.response_policy.nsdname_enable)) if option.response_policy.nsdname_enable is defined -}}
 {{- (' dnsrps-enable ' + functions.named_boolean(option.response_policy.dnsrps_enable)) if option.response_policy.dnsrps_enable is defined -}}
-{{- (' dnsrps-options {\n' + functions.simple_item_list(option.response_policy.dnsrps_options) + '}') if option.response_policy.dnsrps_options is defined and option.response_policy.dnsrps_options -}};
+{{- (' dnsrps-options { ' + option.response_policy.dnsrps_options | join('; ') + '; }') if option.response_policy.dnsrps_options is defined and option.response_policy.dnsrps_options -}};
 {% endif %}
 {% if option.response_padding is defined and option.response_padding %}
 response-padding {
@@ -164,7 +164,7 @@ check-names {{ policy.type }} {{ policy.action }};
 catalog-zones {
 {% for catalog_zone in option.catalog_zones %}
 zone {{ catalog_zone.zone }}
-{% filter indent(bind9_config_indent*3, true) %}
+{% filter indent(bind9_config_indent, true) %}
 {% if catalog_zone.default_primaries is defined and catalog_zone.default_primaries %}
 default-primaries
 {{- (' port ' + catalog_zone.default_primaries.port | string) if catalog_zone.default_primaries.port is defined and catalog_zone.default_primaries.port -}}
diff --git a/templates/named.conf.parental-agents.j2 b/templates/named.conf.parental-agents.j2
index 95b0a4b..8999a34 100644
--- a/templates/named.conf.parental-agents.j2
+++ b/templates/named.conf.parental-agents.j2
@@ -3,8 +3,7 @@
 parental-agents {{ agent.name -}}
 {{ (' port ' + agent.port | string) if agent.port is defined and agent.port -}}
 {{ (' dscp ' + agent.dscp | string) if agent.dscp is defined and agent.dscp }} {
-{% filter indent(bind9_config_indent, true) %}
-{{ functions.list_address_port_key_tls(agent.addresses) -}}
-{% endfilter %}};
+{{ functions.list_address_port_key_tls(agent.addresses) -}}};
+
 {% endfor %}
 {% endmacro %}
\ No newline at end of file