Fixed hierarchy/duplicates