Appending single matches back to the uncategorized list could change the order of types... not sure if that's a big deal, but would be nice to preserve the order if possible.