HCSVLAB-729 Add extra validation for indexes + bug fixes