Index promises by id for better perf