Fix #2113 improve doc search results Upstream-commit: c1bb33ea4d94d38b66f4e8582a584d12818d733a Component: engine