more fixes for tagging