HAL-403: Fix index setup