changes to auto-tag