Remote fixes for indexing and search