diff --git a/lib/Bio/DB/SoapEUtilities.pm b/lib/Bio/DB/SoapEUtilities.pm
index 9eeec7e..6e82ea9 100755
--- a/lib/Bio/DB/SoapEUtilities.pm
+++ b/lib/Bio/DB/SoapEUtilities.pm
@@ -113,6 +113,7 @@ use Bio::Root::Root;
 use Bio::DB::ESoap;
 use Bio::DB::SoapEUtilities::DocSumAdaptor;
 use Bio::DB::SoapEUtilities::FetchAdaptor;
+use Bio::DB::SoapEUtilities::GQueryAdaptor;
 use Bio::DB::SoapEUtilities::LinkAdaptor;
 use Bio::DB::SoapEUtilities::Result;
 
@@ -265,6 +266,12 @@ sub run {
 		    );
 		last;
 	    };
+	    $_ eq 'egquery' && do {
+		$adaptor = Bio::DB::SoapEUtilities::GQueryAdaptor->new(
+		    -result => $result
+		    );
+		last;
+	    };
 	    $_ eq 'efetch' && do {
 		$adaptor = Bio::DB::SoapEUtilities::FetchAdaptor->new(
 		    -result => $result
diff --git a/lib/Bio/DB/SoapEUtilities/DocSumAdaptor.pm b/lib/Bio/DB/SoapEUtilities/DocSumAdaptor.pm
index a84452e..398c9a6 100755
--- a/lib/Bio/DB/SoapEUtilities/DocSumAdaptor.pm
+++ b/lib/Bio/DB/SoapEUtilities/DocSumAdaptor.pm
@@ -125,7 +125,7 @@ sub next_docsum {
 
     my $names = [];
     for (my $i = 1; my $data = $som->dataof("$stem/[$i]"); $i++) {
-	if ( $data->value ) {
+	if ( $data->value and $data->value !~ /^\s*$/) {
 	    my $name = $data->attr->{'Name'}[0];
 	    next unless $name;
 	    my $content = $data->value->{'ItemContent'};
@@ -192,8 +192,8 @@ sub new {
                             my $d = shift;
                             my $k = \'_\'.$method;
                             $self->{$k} = $d if $d;
-                            return (ref $self->{$k} eq \'ARRAY\') ?
-                                   @{$self->{$k}} : $self->{$k};'
+                            return (ref($self->{$k}) eq \'ARRAY\' ?
+                                   @{$self->{$k}} : $self->{$k});'
 
 	);
     return $self;