endless recursion detection & preview update fix