MainEntity missing on FAQPage

I’ve seen that there are already a bunch of similar posts to this, so I’ll try to elaborate on the situation that I see specifically, as well as some more necessray details.

we have a page where we use the Yoast FAQ block in the default editor to generate an FAQ, so we dragged in the block and filled out with all the questions and answers we had for a specific page, and we can see in the schema code for this particular page that it does generate an FAQ-schema , where the main schema is set to be “ItemList” (because the page is an itemlist over things sold by a given brand).

Then that itemlist has a mainEntityOfPage which has two types; Webpage and FAQPage.

Immediately after the two types are declared, it begins writing all the usual properties for the webpage schema, which is great, and then it starts creating an “itemListElement” which is the FAQ, so here is where the question and answers are listed.

The issue with this, is that when I look in Google Search Console, it’s listed as an error because the FAQ doesn’t have “mainEntity” anywhere on it.

So instead of the FAQPage being a nested property as “isPartOF” and then a reference to the webpage schema, it’s listed as a property on the same level AS the webpage in a list-element and then since it just sits as an ItemListElement, there’s no mainEntity on the FAQPage schema to ‘wrap’ the list of questions and answers.

The page I need help with: [log in to see the link]