We've made some fixes to the 10.1 search code that should address this. I believe the relevant commits were on the trunk after you branched. Would be great if you could merge the diff between the point on the trunk at which you branched and the 10.1 branch head into your cloud10 branch and test. This should pick up all 10.1 changes since you branched and allow you to merge subsequent 10.1 changes easily.