Fixed searching issues
Merge pull request #48 from lal-ace/development

Fixed searching issues