more additions to support the new search functionality