Search box layout problem

I have two similar kind of searches:

• Clients: can be searched by code, name, state (active or inactive) and zone.
• Companies: can be searched by code, name and zone.

Client zone and companies zone have different kind of information (for example, clients zone should be a country and companies zone a region). Both searches results have the same data structure so, they can be showed in the same data grid.

I have designed this layout with tabs, but it doesn't convince me. Code and name are shared in two forms but zone combo have different items. It would be nice to find some way to join them in a unique form.