* Convert to iterator

Use iterator for search join conditions and replace hardcoded conditions

* Apply suggestions from code review
Co-authored-by: Cédric Anne <cedric.anne@gmail.com>
Co-authored-by: Cédric Anne <cedric.anne@gmail.com>