Make search selector more selective