Remove spaces from tags.

Review by @huntc