BS-9528, add indexes