changes to make tags sane