Stop looking at the code. Go into the DataAssist Search server behavior.
You will see that there are 2 search criteria defined in the first screen.
you only need one, but set it to search both database columns
Instead of using one criteria to search one column and another criteria to search the second column, use one criteria to search both columns.