Code clean for search
Merge branch 'develop' of https://github.com/pi-engine/pi into develop
CS fix
Merge branch 'develop' of https://github.com/pi-engine/pi into develop
CS fix