The 404 error has been fixed in a subsequent changeset.

As for the supermarket vs. convenience choice, this is a borderline case again.  We settled it some time ago, having all the Proxy Delhaize tagged as supermarmets (on the ground that in general those shops are large enough to potentially push a trolley there) whereas Shop & Go would have shop=convenience.