Fix nested tree navigation