1 files changed, 10 insertions, 0 deletions
diff --git a/lib/Fripost/Schema/Search.pm b/lib/Fripost/Schema/Search.pm
index 7c0ece6..3dc2efa 100644
--- a/lib/Fripost/Schema/Search.pm
+++ b/lib/Fripost/Schema/Search.pm
@@ -53,6 +53,12 @@ sub _domainEntry {
     &_get_values( $entry, \%domain, 'domain', 'dc');
     map { &_get_values($entry, \%domain, $_) }
         qw /isActive owner/;
+    if (defined $domain{owner}) {
+        $domain{owner} = [ $domain{owner} ]
+            unless (ref $domain{owner}) eq 'ARRAY';
+        $domain{owner} = [ map { (split /=/, (split /,/, $_, 2)[0], 2)[1] }
+                               @{$domain{owner}} ];
+    }
     return \%domain;
 }
 
@@ -60,6 +66,10 @@ sub _aliasEntry {
     my $entry = shift;
     my %alias;
     &_get_values( $entry, \%alias, 'address', 'mailLocalAddress');
+    if (defined $alias{address}) {
+        $alias{address} = [ $alias{address} ]
+            unless (ref $alias{address}) eq 'ARRAY';
+    }
     &_get_values( $entry, \%alias, 'goto', 'mailTarget');
     &_get_values( $entry, \%alias, 'isActive');
     return \%alias;