Fixed separator replacement and readded HTML output