Another tweak to #962 to restrict to export fields only