Sky UK (London Area) EPG Showing Wrong info

[Nanganator 3]

Similar to the post Sky Sports Premier League, looks like Gracenote is doing a big clean up. Previously I was using GBR-1000016-DEFAULT but that guide is blank now and doesn't even show as an option in Emby when trying to add new guide data.
Replaced it with GBR-1000197-DEFAULT which is the Sky Q for any London (and surround area) post codes (E.g. W6).

There are a few Issues with GBR-1000197-DEFAULT
There is a bunch of channel number duplication from 402 upwards.
Sky Sports Cricket and Golf are both showing as being on channel 405. EPG data is correct for each respective channel, just a number duplication. Sky Cricket was traditionally on 404


Also none of the Sky Sports F1 listings work any more either at 406 SSPOF1 or 407 SKYSF1HD (same number as Sky Sports Tennis (407 SKYSPTUK)). Now the guide data is only showing "Sky Sports F1 in HD on 507 from February 24". 507 is NHK World News and there are no other Sky Sports F1's in the list (that I could see with some slow scrolling through).

[Luke 42274]

@sa2000