CHANGE: tweaked searching settings