Seperate client first name and surname boxes

I would like to see a first name and surname box in client details so that if you search a client it will search on surname, first name or company/ group. As it appears to only search the first name.

In the client management screen you can already search by first name or surname as well as company name.

The first name and surname fields search the contact records associated with a given client. You can have multiple contacts listed for each of your clients.