TDI-30401:fix a small pb of delete
TDI-30401:fix 2 pbs of context view.