Isolate desktops and monitors for "switch to next/prev" window

[xalt7x]

Describe the bug
I'm trying to have window switching in one zone on the same workspace (kinda like "monocycle" with Krohnkite but for tiled windows instead if single window). For that, I place several windows on the same zone and use shortcuts "Switch to previous window in current zone" / "Switch to next window in current zone". It works well for some time but when I move windows across virtual desktops or use additional display, I'm occasionally switch to unexpected window.

To Reproduce

For virtual desktops;

1. Place 2 windows in the same zone.
2. Make sure they're switchable with aforementioned shortcuts
3. Use shortcut "Window One Desktop Right/Left/Up/Down" to move second window to another desktop
4. You will be moved with a window to the different desktop. Return to the desktop with the first window
5. Try shortcuts "Switch to previous window in current zone" / "Switch to next window in current zone
6. You will switch to the window on another desktop

For displays:

1. Switch to the same layout on both displays
2. Place 2 windows in the equivalent zone on both displays
3. Try shortcuts "Switch to previous window in current zone" / "Switch to next window in current zone
4. You will switch to the window on on another displays

Expected behavior
I'd like to switch between windows in the particular zone only on the current virtual desktops or display.

System information (please complete the following information):

• KZones version: 0.9
• Plasma version: 6.2.5
• Wayland or X11: Wayland

Additional context
"Track active layout per screen" helps if I use different layouts on screens.