redo the Search functionality using a much simpler approach