Merge "Misc fixes to improve search" into pi-dev