Well that was tough but enjoyable. Some of the thematic cells were really difficult to pin down. And alas, without them, my google searches were throwing up all sorts of gubbins initially. Got there in the end though... phew.
In case anyone else doesn’t have the ODQ (it’s on my Christmas list!), I found a pdf of it online so was able to reassure myself that the Wiki mismatch was resolved in the ODQ.