Adapt search behaviour according to [#1345]