Remote search/indexing fixes