SEARCH: Adapt handling of swissearch parameter

@loicgasser: As discussed.