Speed up export when NONE is encountered