Permit tags with hyphens

Previously a tag like "foo-bar" would not be returned as "foo-bar" but as two tags: "foo" and "bar".