Fix the pagination issue with up-and-coming themes (bug 944096)

Okay. If we are sure we don't break URLs, I'm fine. Otherwise maybe other option is to have a replace('-', '_') on this magic™?