Updated the logic for determine which `list` to show