Correcting DataStruct preliminary select conditions