3 files changed, 13 insertions, 5 deletions
diff --git a/rt/share/html/Search/Elements/BuildFormatString b/rt/share/html/Search/Elements/BuildFormatString
index f77c8da84..96e6a2863 100644
--- a/rt/share/html/Search/Elements/BuildFormatString
+++ b/rt/share/html/Search/Elements/BuildFormatString
@@ -69,11 +69,15 @@ $CurrentDisplayColumns => undef
 # it -- and it grows per request.
 
 # All the things we can display in the format string by default
-my @fields = qw(
+# referenced by their ColumnMap keys
+my @fields = (
+  qw(
     id QueueName Subject
+  ),
+    
+    $m->comp('/Elements/CustomerFields', 'Names'), #freeside
 
-    Customer Agent CustomerClass CustomerTags AdvertisingSource
-
+  qw(
     Status ExtendedStatus UpdateStatus
     Type
 
@@ -99,7 +103,7 @@ my @fields = qw(
     Bookmark
 
     NEWLINE
-
+  )
 ); # loc_qw
 
 $m->callback( CallbackOnce => 1, CallbackName => 'SetFieldsOnce', Fields => \@fields );
diff --git a/rt/share/html/Search/Elements/ConditionRow b/rt/share/html/Search/Elements/ConditionRow
index fe21f4d66..65e217639 100644
--- a/rt/share/html/Search/Elements/ConditionRow
+++ b/rt/share/html/Search/Elements/ConditionRow
@@ -82,7 +82,8 @@ $handle_block = sub {
         my $res = '';
         $res .= qq{<select id="$name" name="$name">};
         my @options = @{ $box->{'Options'} };
-        while( my $k = shift @options ) {
+        while( @options ) {
+            my $k = shift @options;
             my $v = shift @options;
             $res .= qq{<option value="$k">$v</option>};
         }
diff --git a/rt/share/html/Search/Elements/PickBasics b/rt/share/html/Search/Elements/PickBasics
index b03fc15d5..ff30f7c11 100644
--- a/rt/share/html/Search/Elements/PickBasics
+++ b/rt/share/html/Search/Elements/PickBasics
@@ -209,6 +209,9 @@ my @lines = (
     },
 );
 
+#freeside
+push @lines, $m->comp('/Elements/CustomerFields', 'PickBasics');
+
 $m->callback( Conditions => \@lines );
 
 </%INIT>