Control threads WhatsApp

We would like to be able to manually control threads in the WhatsApp channel.

Currently we have to many threads and all discussing the same issue.

We want all new incoming message of the same contact person assigned to the same thread. This untill the thread is manually closed. When it is closed, a new thread should be created when the contact person sends a new message.