Implements #48 - prevent one-to-many joins from creating extra records