Add search directory flexibility to search