hyperswitch

refactor: address panics due to indexing and slicing

#3233

Merged