taggging fixes