Re #922 'search also for'-related changes.