Changes the tagItem() and batch tagging behavior

Note that this includes changes from #934  so you can test that at the same time. They can either be both merged with this pr or done in sequence.