Join Logic now present when other conditions are
Logic to exclude relationship filtering when not needed