Better long-line support in switcher lists