Fix 2D dataset expressions