Gathered PRs containing search fixes from v5.0 line rebased onto v4.4