LT-15850: Fix 'Subentry Under'

Change-Id: I7806b5aefe931d3702a9ee35012d0a15e7dce866