Reverted back to using entity labels when removing redundant tabs.