Fix data duplication problems resulting from incorrect join
Fix data duplication problems resulting from incorrect join

JayBoyer/new-trisano,JayBoyer/new-trisano,JayBoyer/new-trisano,JayBoyer/new-trisano,JayBoyer/new-trisano,JayBoyer/new-trisano,JayBoyer/new-trisano