Added haystack and initial search_indexes