Added better search support