#706 base management + haystack indexes