'Recently Added' showing for EVERY library on Home Screen regardless of how old it is (Shield/Xbox/PS4)

I suffer from the same only have 4 movie libraries and 10-ish tv libraries so you can imagine what it looks like

I’ve added 2 more with all Movies and All TV and massaged the Home screen to show new added and dashboard in the Webclient,
But the Android TV doubles everything up
On Deck:
2 by 2 by 2 by 2
Recently Added TV:
2 by 2 by 2 by 2

Deleting my other libraries would fix the issue but it looks like something is in the works going off the On Deck & Continue Watching post