Fix the visiblity and partial reinsert fix