Tweaking options to make search work properly again.
Tweaking options to make search work properly again.