CRM-13240 fixes
Merge pull request #107 from deepak-srivastava/search

CRM-13240 fixes