Tweaking options to make search work properly again.