Fixing tag submission

these broke with the addition of clickable tags because the DOM changed.
This version should be slightly more resistant against such breakages.
fixes #637