Implemented handling of selection command during generation