search rates improvements
Merge remote-tracking branch 'origin/master'
Merge branch 'issue4' of https://github.com/devstarter/ii into issue4