contract spending - use 'entity_name' and 'entity_id'

[akariv]

Prefer to use 'entity_name' and 'entity_id' Instead of 'supplier' and 'supplier_name'.
Only if the first two are empty, fall back to the 'supplier' ones.

[danielbraun]

I'm on it

[shaylavi]

is that the object that's returning from the search results? cause I'm using the "supplier" object in the new highlight component

[akariv]

Yes, we should be using the 'entity_name' whenever it's available.