Fix formatting
Fix bug preventing special characters (like [brackets]) in name attribute