Updated data store indexes for allow system notifications