Updated how joins work with thru relationships on join