Make stops index by stop id, instead of db index. Again.