Change top-level description query, fixes #5152

Search in the ancestors and itself