Tentative annotation support and search (both incomplete)