Switch to span tags for anchoring

--HG--
extra : amend_source : afcd61a44a98d24f08379859c95c7c6ba4063a50