GCP-5360: Table Viewer changes