Refined validator code
Fixed dynamic fragment history state