Fix on multiple custom field data post multi-join optimisation