Work on getting search all working