Minor restyling of tags
Switched schema to use less aggressive word splitting
Reverted schema changes