Patch Set 6: I would prefer that you didn't submit this

(2 inline comments)

Looks good.

Some small issues remaining:

1. 2 inline comments
2. typo in preferences page: ... when index change [changes]

Can you fix the small issues and rebase the change?
Then we can merge it in.