fix issue #6954
fix #6542
pkg-search behavior was changed
Merge pull request #6988 from giantlock/develop

fix issues #6542, #6954