Tag: improve consistency