multi domain fixes whilst retaining si_index table for now