Added support for hierarchy links with new urls behaviour