Delay deleting of tags and fix #13
Fixes #12