Revert "Remove trailing % signs in indexing."

This reverts commit 0fb74542832776036b37713cb6621b2b90e4eedb.
It does introduce extra spaces where there should not be any.