4 files changed, 10 insertions, 1 deletions
diff --git a/rt/share/html/Search/Elements/BuildFormatString b/rt/share/html/Search/Elements/BuildFormatString
index 96e6a2863..57c767911 100644
--- a/rt/share/html/Search/Elements/BuildFormatString
+++ b/rt/share/html/Search/Elements/BuildFormatString
@@ -76,6 +76,7 @@ my @fields = (
   ),
     
     $m->comp('/Elements/CustomerFields', 'Names'), #freeside
+    $m->comp('/Elements/ServiceFields', 'Names'), #freeside
 
   qw(
     Status ExtendedStatus UpdateStatus
diff --git a/rt/share/html/Search/Elements/PickBasics b/rt/share/html/Search/Elements/PickBasics
index ff30f7c11..e9534237b 100644
--- a/rt/share/html/Search/Elements/PickBasics
+++ b/rt/share/html/Search/Elements/PickBasics
@@ -210,7 +210,6 @@ my @lines = (
 );
 
 #freeside
-push @lines, $m->comp('/Elements/CustomerFields', 'PickBasics');
 
 $m->callback( Conditions => \@lines );
 
diff --git a/rt/share/html/Search/Elements/PickCriteria b/rt/share/html/Search/Elements/PickCriteria
index 44e3b7037..5eb112d17 100644
--- a/rt/share/html/Search/Elements/PickCriteria
+++ b/rt/share/html/Search/Elements/PickCriteria
@@ -52,6 +52,7 @@
 
 
 <& PickBasics &>
+<& PickCustomerFields &>
 <& PickCFs, cfqueues => \%cfqueues &>
 
 <tr class="separator"><td colspan="3"><hr /></td></tr>
diff --git a/rt/share/html/Search/Elements/PickCustomerFields b/rt/share/html/Search/Elements/PickCustomerFields
new file mode 100644
index 000000000..96d8e47e7
--- /dev/null
+++ b/rt/share/html/Search/Elements/PickCustomerFields
@@ -0,0 +1,8 @@
+% if ( $RT::URI::freeside::IntegrationType eq 'Internal' ) {
+%     my @lines;
+%     push @lines, $m->comp('/Elements/CustomerFields', 'Criteria');
+%     push @lines, $m->comp('/Elements/ServiceFields',  'Criteria');
+%     foreach( @lines ) {
+<& ConditionRow, Condition => $_ &>
+%     }
+% }