First small bugfixes inside the search to get rid of the translate-helpers.