# This patch file was generated by NetBeans IDE
# Following Index: paths are relative to: W:\www\dev\administrator\components\com_comprofiler
# This patch can be applied using context Tools: Patch action on respective folder.
# It uses platform neutral UTF-8 encoding and \n newlines.
# Above lines and this line are ignored by the patching process.
--- administrator/components/com_comprofiler/admin.comprofiler.html.php
+++ administrator/components/com_comprofiler/admin.comprofiler.html.php
@@ -288,7 +288,7 @@
 			$sortfields[]	=	$randomSort;
 		}
 		// this query is for listing filterable fields
-		$_CB_database->setQuery( "SELECT f.title, f.name"
+		$_CB_database->setQuery( "SELECT f.title, f.name, f.tablecolumns"
 			. "\n FROM #__comprofiler_fields f"
 			. "\n INNER JOIN #__comprofiler_plugin AS p ON (f.pluginid = p.id)"
 			. "\n WHERE f.published = 1"
@@ -864,10 +864,15 @@
 			$filterlistpart=array();
 			$filterlistpart=explode(" ",$filterlist);
 			$filterparts[$i]['field']=str_replace("`","",$filterlistpart[0]);
-			$_CB_database->setQuery("SELECT title FROM #__comprofiler_fields WHERE name='".$filterparts[$i]['field']."' LIMIT 1");
-			$filtertitle=$_CB_database->loadResult();
+            $_CB_database->setQuery("SELECT title, name FROM #__comprofiler_fields WHERE tablecolumns LIKE '%".$filterparts[$i]['field']."%' LIMIT 1");
+            $filtertitle=null;
+            $_CB_database->loadObject($filtertitle);
 			$filterparts[$i]['value']=$filterlist;
-			$filterparts[$i]['title']=str_replace(array("'","`"),"",str_replace($filterparts[$i]['field'],getLangDefinition($filtertitle),$filterlist));
+            $filtername=getLangDefinition($filtertitle->title);
+            if ($filterparts[$i]['field']!=$filtertitle->name) {
+                $filtername.=' ('.$filterparts[$i]['field'].')';
+            }
+			$filterparts[$i]['title']   =   str_replace(array("'","`"),"",str_replace($filterparts[$i]['field'],$filtername,$filterlist));
 
 			$i++;
 		}
@@ -877,9 +882,17 @@
 				<div id="simFilter" name="simFilter" style="<?php echo $simStyle; ?>" >
 				<select name="filterfieldlist">
 					<?php
-						foreach ($filterfields AS $filterfield) {
-							echo "<option value=\"`".$filterfield->name."`\">". htmlspecialchars( getLangDefinition($filterfield->title) ) ."\n";
+						foreach ( $filterfields AS $filterfield ) {
+                            $filter_cols    =   explode( ',', $filterfield->tablecolumns );
+
+                            if ( count( $filter_cols ) > 1 ) {
+                                foreach ( $filter_cols as $filter_col ) {
+                                    echo "<option value=\"`" . $filter_col . "`\">". htmlspecialchars( getLangDefinition( $filterfield->title ) . ' (' . $filter_col . ')' ) ."\n";
 						}
+                            } else {
+                                echo "<option value=\"`" . $filterfield->name . "`\">". htmlspecialchars( getLangDefinition( $filterfield->title ) ) ."\n";
+                            }
+						}
 
 					?>
 				</select>