fixes in the add and remove tags blocks