Rearchitected the search and got DOB working as well