fix: #1614456 [current-page:query:?] tokens should fall back to empty string

Closes #1614456

Applies the same fix originally targeted at the old hook function in the previous MR.