As an astronomy enthusiast, I want to use the Query Builder in order to query for all the planets in the Solar System

Problem:
Currently, "part of" (P361) does not seem to be really transitive.

The data is currently modeled as follows:

Earth (Q2) is part of (P361) Earth-Moon system (Q18589965)
Earth-Moon system (Q18589965) is part of (P361) inner Solar System (Q7879772)
inner Solar System (Q7879772) is part of (P361) Solar System (Q544)

I want to be able to use the Query Builder not only to query "What planets are part of the Earth-Moon system?" and get Earth back, but also query it for "What planets are part of the Solar System?" and get Earth back. I would expect the checkbox "Include related values in the search (recommended)" to do exactly that, but it doesn't.

Checking the checkbox generates the Sparql ?statement1 (ps:P361/(wdt:P279*)) wd:Q544., meaning it treats "part of" similar to "instance of".
What we actually want is to treat "part of" similar to "located in the administrative territorial entity" and to generate the following Sparql when checking the checkbox: ?statement1 (ps:P361/(wdt:P361*)) wd:Q544.

Example:

The query instance of planet AND part of Solar System finds no results.
Currently generated query: https://w.wiki/6UKi
Actually desired query: https://w.wiki/6UKZ

Screenshots/mockups:

BDD
GIVEN
AND
WHEN
AND
THEN
AND

Acceptance criteria:

Open questions: