include the id in link definition tokens