Minor fix for custom tags and format change