Change check for none to check for EMPTY_VALUES on scalar fields