move bugfix for tagging from bbi to finc