Adapt to make it work with [#1347]
Replace marker
Adapt to make it work with [#1347]
Small fix
SEARCH: Adapt handling of swissearch parameter