- changes due to helper.py change of get_q_indexes function