Revert "Revert "Speed up deliveries index again""

This reverts commit a5a39df46cb68256547a07eecbbb921b153b88d4.