Ensures kinds are indexed by the compound primary key [id, client_id]

[#76841300]