Fixing 'add return fields' and 'add order fields' to check the resource of the fields
Fixing 'add return fields' and 'add order fields' to check the resource of the fields

javaito/HolandaCatalinaFw,javaito/HolandaCatalinaFw,nojustiniano/HolandaCatalinaFw,kevchuk/HolandaCatalinaFw,javaito/HolandaCatalinaFw,nojustiniano/HolandaCatalinaFw