Added better search