Add a search option in the workHandler