Maybe something like this:
So my proposal is thus.
--Apologize if this has been offered before, I did not read through all posts here
In the Marketplace you can filter on what Commercial Building produces the item or Factories for raw materials.
--This would limit returns to just items from that producing building
If you choose one of these filters, you automatically filter out any Vu or Expansion items
--So if you are looking for one of these items, you have to use the marketplace as it currently is today.
