fixed issue #530 and modified search
Merge pull request #531 from safiyu/newissue

fixed issue #530 and modified search