Fix tags to be on multiple lines, not comma separated