Query : fix text statement copy
CSV : handle more primitive types