Fixup search stuff

Change-Id: Id77db9e0f434d877f53663cf3456c027c8907eb8