Fix custom index brokenness