Improve ak.record indexing

I want to improve some changes from the last merge request, where I have the feeling that they could lead to problems in the near future