fix error in search
Merge branch 'issue-33' into develop