Performance enhancements for compose update page, part 2: add index