Remove some shit to support quoted tags containing commas