diff --git a/lib/SLUB/LZA/Rosetta/TA/Command/count.pm b/lib/SLUB/LZA/Rosetta/TA/Command/count.pm
index 43f2475af6cbba559124f18dc730fc20f39ca1a0..4728dac7a23c66cb1b633b3e14d8ebc0c77de222 100644
--- a/lib/SLUB/LZA/Rosetta/TA/Command/count.pm
+++ b/lib/SLUB/LZA/Rosetta/TA/Command/count.pm
@@ -34,8 +34,8 @@ sub opt_spec {
             ["creationdate|c=s" => "search based on creationdate string"],
             ["modificationdate|m=s" => "search based on modificationdate string"]
         ] } ],
-        ["descriptive|d" => "count based on string search in descriptive metadata"],
-        ["source|s" => "count based on string search in source metadata"],
+        ["descriptive|d=s" => "count based on string search in descriptive metadata"],
+        ["source|s=s" => "count based on string search in source metadata"],
         ["ie|i=s" => "search a specific IE"],
         ["format" => hidden => {one_of => [
             ["with-format=s" => "with pronom format id"],
@@ -80,7 +80,7 @@ sub execute {
         push @queries, "FILE.objectCharacteristics.modificationDate==$opt->{modificationdate}";
     }
     if (exists $opt->{'with_format'}) {
-        push @queries, "FILE.generalFileCharacteristics.formatLibraryId=$opt->{'with_format'}";
+        push @queries, "FILE.generalFileCharacteristics.formatLibraryId==$opt->{'with_format'}";
     }
     # unsupported by Rosetta <= 7.0
     #if (exists $opt->{'without_format'}) {
@@ -103,7 +103,8 @@ sub execute {
     }
 
 
-    my $query = join(" and ", @queries);
+    #my $query = join(" and ", @queries);
+    my $query = join("+", @queries);
     if (exists $opt->{debug}) {
         use Data::Printer;
         p( $opt);