more tweaks for robust tbpl links