This fixes some regressions introduced by !1545 (merged) when searching the catalog for non ascii text
This will create a new commit in order to revert the existing changes.
