Metadata bugfixes
Remove newline in 'around' handling