Safer search logic

Hey buddy, please accept my changes :)