Add missing @Id annotation to id fields for all the join VOs to support
findById call.