Work on unifying search list throughout host and router