fix flickr machine tags again; catch some 502 errors for retry