Rename local variables in #read(Select)
Add 'NONE' to ExtractionStep enums