Fix merge problems
Fix non-ascii chars in tags
Cleanup