Enhancements to link/annotation show templates