IFRC: revert accidental change in organisation custom form, consistency for options.json, unit tests