Fixed bug, removed first TODO, not relevant as I don't use this
feature.
Also update the TLDs to the latest set.