Improve source restoration

[Enitoni]

Currently, there is an issue where restoring a source will often result in it restoring an older source, because it was the best match, before the relevant one is available again. This race condition makes it harder to reliably find the right source.

It might be a good idea to do some sort of diffing and check only incoming new sources on each check.