Fix display issue - also added isEmpty check to added data check

Start to add “By metadata block”
Fix Compare Primitive and check empty for deleted data