Change kitinLinkEntity from isolated to nested scope and adapt templates