feature #1664: Fix cluster-tab tabs