Fix for search indexing issues.