CRM-15438 - Fix search component_mode selections
Merge pull request #4371 from colemanw/CRM-15438

CRM-15438 - Fix search component_mode selections