autotagging fixes and additions