I've decided to stick with a free flickr account, but I've added plenty of tags, and use them to make sets too.