CRM-12924, fixes / improvements
Merge pull request #67 from deepak-srivastava/search

CRM-12924, fixes / improvements