Added better search.