Fixes to hierarchy selection when there is no parent.