Profile Listings Searches on and Displays Incorrect Location Data

The Profile listings search and selector uses location data for contacts' PRIMARY location, regardless of the location which is specified in the Profile. So if Profile selector field is State (Work), and a contact's primary location is Home, the search query will match on the wrong location, and selector will display the Home State value for that contact. It SHOULD search on and display the value for the specified location type.

To recreate this issue on public sandbox:

• Navigate to http://sandbox.openngo.org/civicrm/drupal-php5/civicrm/profile?_qf_Search_display=true
• Search for contacts where State (Work) = California
• Select Chris Zope (cid=59) and note that the State (Work) column displays California (this is incorrect - if you view this contact in civicrm/contact/view you will see that he only has a Home location - with state = CA).
• Click Details - the Details page CORRECTLY has a blank value for State (Work).