This fixes some regressions introduced by !1545 when searching the catalog for non ascii text See merge request !1752
