Fixes to implement task "Fix rollback to delete only those with the
given tag id"