diff --git a/Resources/config/form.xml b/Resources/config/form.xml
index 30cabaa3..6d2c619e 100644
--- a/Resources/config/form.xml
+++ b/Resources/config/form.xml
@@ -9,6 +9,7 @@
diff --git a/Resources/config/helper/collector.xml b/Resources/config/helper/collector.xml
index d9d2f12e..ccf80876 100644
--- a/Resources/config/helper/collector.xml
+++ b/Resources/config/helper/collector.xml
@@ -9,6 +9,7 @@
@@ -17,6 +18,7 @@
@@ -30,6 +32,7 @@
@@ -37,6 +40,7 @@
@@ -45,66 +49,79 @@
@@ -112,6 +129,7 @@
@@ -119,6 +137,7 @@
@@ -126,6 +145,7 @@
@@ -133,6 +153,7 @@
@@ -140,11 +161,13 @@
@@ -152,21 +175,25 @@
@@ -175,11 +202,13 @@
@@ -187,36 +216,43 @@
@@ -224,6 +260,7 @@
diff --git a/Resources/config/service/direction.xml b/Resources/config/service/direction.xml
index 04df3cc1..308e5d1f 100644
--- a/Resources/config/service/direction.xml
+++ b/Resources/config/service/direction.xml
@@ -9,6 +9,7 @@
diff --git a/Resources/config/service/distance_matrix.xml b/Resources/config/service/distance_matrix.xml
index 7c221a95..f4056114 100644
--- a/Resources/config/service/distance_matrix.xml
+++ b/Resources/config/service/distance_matrix.xml
@@ -9,6 +9,7 @@
diff --git a/Resources/config/service/elevation.xml b/Resources/config/service/elevation.xml
index 2d73d794..6e867d12 100644
--- a/Resources/config/service/elevation.xml
+++ b/Resources/config/service/elevation.xml
@@ -9,6 +9,7 @@
diff --git a/Resources/config/service/geocoder.xml b/Resources/config/service/geocoder.xml
index e3152a33..574be44d 100644
--- a/Resources/config/service/geocoder.xml
+++ b/Resources/config/service/geocoder.xml
@@ -9,6 +9,7 @@
diff --git a/Resources/config/service/place_autocomplete.xml b/Resources/config/service/place_autocomplete.xml
index 7c54dede..5eab3590 100644
--- a/Resources/config/service/place_autocomplete.xml
+++ b/Resources/config/service/place_autocomplete.xml
@@ -9,6 +9,7 @@
diff --git a/Resources/config/service/place_detail.xml b/Resources/config/service/place_detail.xml
index 59680fa0..2dae1fd2 100644
--- a/Resources/config/service/place_detail.xml
+++ b/Resources/config/service/place_detail.xml
@@ -9,6 +9,7 @@
diff --git a/Resources/config/service/place_photo.xml b/Resources/config/service/place_photo.xml
index 13b0a8fb..500c7e35 100644
--- a/Resources/config/service/place_photo.xml
+++ b/Resources/config/service/place_photo.xml
@@ -9,6 +9,7 @@
diff --git a/Resources/config/service/place_search.xml b/Resources/config/service/place_search.xml
index fa5132a0..3518889e 100644
--- a/Resources/config/service/place_search.xml
+++ b/Resources/config/service/place_search.xml
@@ -9,6 +9,7 @@
diff --git a/Resources/config/service/serializer.xml b/Resources/config/service/serializer.xml
index 5522ee41..ba2974d1 100644
--- a/Resources/config/service/serializer.xml
+++ b/Resources/config/service/serializer.xml
@@ -9,6 +9,7 @@
%kernel.root_dir%/../vendor/egeloen/google-map/src/Service/Serializer
diff --git a/Resources/config/service/time_zone.xml b/Resources/config/service/time_zone.xml
index b95ea0b4..91e087e3 100644
--- a/Resources/config/service/time_zone.xml
+++ b/Resources/config/service/time_zone.xml
@@ -9,6 +9,7 @@
diff --git a/Resources/config/templating.xml b/Resources/config/templating.xml
index 4ab0dce4..3b0c3da8 100644
--- a/Resources/config/templating.xml
+++ b/Resources/config/templating.xml
@@ -9,6 +9,7 @@
@@ -17,6 +18,7 @@
@@ -25,6 +27,7 @@
@@ -33,9 +36,11 @@
+ public="true"
diff --git a/Resources/config/twig.xml b/Resources/config/twig.xml
index cef20089..c3bc0684 100644
--- a/Resources/config/twig.xml
+++ b/Resources/config/twig.xml
@@ -9,6 +9,7 @@
@@ -17,6 +18,7 @@
@@ -25,6 +27,7 @@
@@ -33,6 +36,7 @@