Make "search by number" function work

Previous "search by number" is wrong. Re-implement it to make it work.
Add flexible to handle searchValue as both null-terminated and not
null-terminated.

Change-Id: Ie50f8d29dfcbae868c43d482467b09b08ed2be0f