Use account table in search

Change-Id: Id7dd6342e50d1403cc6c9f3f2a882a2d2125e08d