CRM-13024 fixes

----------------------------------------
* CRM-13024: Search Builder dropdowns broken for Groups, State, Country ...
  http://issues.civicrm.org/jira/browse/CRM-13024
Merge pull request #1169 from monishdeb/CRM-13024-fixes

CRM-13024 fixes