Fixes #1227 Jump to page - invalid URL

Better implementation