CRM-12925, location / department fixes
Merge pull request #74 from deepak-srivastava/search

CRM-12925, location / department fixes