Changed link to name instead of id and hid id