Export options fields

Remove duplicate code
[ci skip]