Add more searching to search