Fix white spaces in tags