diff --git a/lib/WebGUI/Help/Asset_Survey.pm b/lib/WebGUI/Help/Asset_Survey.pm
index b17e242a4..ce97f5a02 100644
--- a/lib/WebGUI/Help/Asset_Survey.pm
+++ b/lib/WebGUI/Help/Asset_Survey.pm
@@ -55,16 +55,16 @@ our $HELP = {
                         ],
                     },
                 ],
-                {   'name'      => 'question_loop',
-                    'variables' => [
-                        { 'name' => 'question.question' },
-                        { 'name' => 'question.allowComment' },
-                        { 'name' => 'question.id' },
-                        { 'name' => 'question.comment.field' },
-                        { 'name' => 'question.comment.label' },
-                        { 'name' => 'question.answer.field' }
-                    ]
-                },
+            },
+            {   'name'      => 'question_loop',
+                'variables' => [
+                    { 'name' => 'question.question' },
+                    { 'name' => 'question.allowComment' },
+                    { 'name' => 'question.id' },
+                    { 'name' => 'question.comment.field' },
+                    { 'name' => 'question.comment.label' },
+                    { 'name' => 'question.answer.field' }
+                ]
             },
         ],
         related => []
diff --git a/lib/WebGUI/Search.pm b/lib/WebGUI/Search.pm
index 434d22ebe..4af97b3f2 100644
--- a/lib/WebGUI/Search.pm
+++ b/lib/WebGUI/Search.pm
@@ -17,6 +17,7 @@ package WebGUI::Search;
 use strict;
 use Carp qw( croak );
 use WebGUI::Asset;
+use WebGUI::Pluggable;
 
 =head1 NAME
 
@@ -429,9 +430,9 @@ sub search {
 	if (exists $rules->{joinClass}) {
             my $join        = [ "left join assetData on assetIndex.assetId=assetData.assetId" ];
             for my $className ( @{ $rules->{ joinClass } } ) {
-                my $cmd         = "use " . $className;
-                eval { $cmd };
-                $self->session->errorHandler->fatal("Couldn't compile asset package: ".$className.". Root cause: ".$@) if ($@);
+                if ( ! eval { WebGUI::Pluggable::load($className) } ) {
+                    $self->session->errorHandler->fatal($@);
+                }
                 foreach my $definition (@{$className->definition($self->session)}) {
                     unless ($definition->{tableName} eq "asset") {
                         my $tableName = $definition->{tableName};