Merge pull request #87 from tararoys/fixing_search

Fixing search
Merge branch 'master' into health_labels