Remove span wrapping from templatehandler

 * Fixes a test and arguably improves the output for other blacklisted ones.

 * Removed the id stuff because they aren't transfered from meta markers
   as it is.

Bug: 65408
Change-Id: If2805e7d4dbfa11e938e4bc730af026e2e399466