The same here: I have to query differently for local and remote. Here I was just specifying that I split them to allow the separate query of the two.

We could also change the way we query the stat, by also adding a "remote" flag. Dunno