Entity collection now indexes at the right time