Issue #61 sorted - not using Tags.add consistently