Tweaks for #1296 for individual row action links