Add some proper tags that we're interested in