Make sure name-suggestion presets are inheriting the correct fields

[bhousel]

This relates to #5710

Here is a Marathon fuel station with brand:wikidata=Q458363.. This made it match the Marathon gas station preset, which is great! But it should also show a building field with the value "roof", which is missing. I have to look into why.

I think the brand presets field lists are currently just copied from the original presets, and they should instead inherit the fields of them (once #5710 is done).