Fix single column bug again;
Simplify logic around creating and updating isotope