code cleanup; search is functioning properly -- doing AND not OR