Fix for pdi-11865 - select editable and updateble fields and reference fields