Resolve pagination escaping issue

Fixes and improvements
This update is recommended for all sites/users of 1.8.*

• Resolve potential pagination issue #1642 (thanks @gchtr).