fixed bugs of search: & -> |
Merge remote-tracking branch 'origin/develop'