Fixed Many-to-Many relation logic