Changes to fix search, and to more cleanly separate tier-1 (public) and tier-2 APIs