0.61.1 - Some switches only show up in some groups in the front end

I have different tabs for different rooms on my front end configuration. Each one has lights and other components for each room. Nothing crazy. Then I have an ‘All Lights’ tab that lets me see every connected light I have. Since installing 0.61.1, my All Lights tab doesn’t show all my lights, yet the same lights show up in the other room tabs. It seems to be limited to GE and Homeseer Z wave switches for some reason. LIFX, Yeelight, and some Z wave dimmers show up. I have verified the entity IDs are exactly the same as in the groups that work and there are no logs to show any errors.

As an example, as part of my Outside tab, I call this group and all these lights show up just fine:

  outside_lights:
    name: Outside Lights
    view: no
    entities:
      - switch.d31_porch_lights_switch
      - switch.d22_deck_lights_switch
      - switch.d8_security_lights_primary_switch

My All Lights tab looks like this:

  all_lights:
    name: Lights
    view: yes
    icon: mdi:lightbulb
    entities:
      - group.light_switches

  light_switches:
    name: 'All Lights'
    view: no
    entities:
      - switch.d31_porch_lights_switch
      - switch.d22_deck_lights_switch
      - switch.d8_security_lights_primary_switch
      - light.upstairs_lamp
      - light.master_bedroom_lamp
      - switch.d24_garage_lights_switch
      - light.downstairs_lamp
      - light.d3_dimmer_level #MB Rock Lamp
      - light.yeelight_strip_zzzzzzzz #Bed Lights
      - light.yeelight_strip_xxxxxxxx #Fireplace Light

In this group, the porch lights, deck lights, security lights, and garage lights do not show up at all.

As a test, I removed the subgroup and put all the light and switch entity IDs directly into the all lights group and reloaded Groups. I ended up with two subgroups: switches and lights. Everything showed up, just segregated by entity type.

Has anyone else seen this behavior?

EDIT: Something else I realized, with the normal configuration, even though I have switches mixed in, the group actually shows up with the name “Light” as if it just filtered out lights and disregarded my group name altogether.

EDIT 2: In moving entities back and forth between group and subgroup, and going back to the original configuration, the tab loads correctly when I reload groups. If I restart Hass though, it reverts back to ignoring switches.

Seems that Home Assistant didn’t like my naming convention any more. I changed the main view group to “lights_group” and the sub group with the actual lights in it to “lights_all” (vs. "all_lights which it didn’t like for some reason), and now everything works as expected.