Add some more missing indexes for ERDB 3.1