few more fixes for multi tagging