Escape dashes in shields URL
Clean up badge html whitespace