Adding separate conditions search logic