untag more
Merge pull request #772 from kostya/untag2

untag more things