diff --git a/view/poco_entry_xml.tpl b/view/poco_entry_xml.tpl
index c3db9f2b27..4d84cee416 100644
--- a/view/poco_entry_xml.tpl
+++ b/view/poco_entry_xml.tpl
@@ -2,10 +2,6 @@
 {{ if $entry.id }}<id>$entry.id</id>{{ endif }}
 {{ if $entry.displayName }}<displayName>$entry.displayName</displayName>{{ endif }}
 {{ if $entry.preferredUsername }}<preferredUsername>$entry.preferredUsername</preferredUsername>{{ endif }}
-{{ if $entry.urls }}
-{{for $entry.urls as $url }}
-<urls><value>$url.value</value><type>$url.type</type></urls>
-{{endfor}}
-{{ endif }}
-{{ if $entry.photos }}<photos><value>$entry.photos.value</value><type>$entry.photos.type</type></photos>{{ endif }}
+{{ if $entry.urls }}{{ for $entry.urls as $url }}<urls><value>$url.value</value><type>$url.type</type></urls>{{ endfor }}{{ endif }}
+{{ if $entry.photos }}{{ for $entry.photos as $photo }}<photos><value>$photo.value</value><type>$photo.type</type></photos>{{ endfor }}{{ endif }}
 </entry>