TUP-2240: fix remaining problem for context view on TOP.