This make the refresh url more flexible, i.e. he identifier can be
inserted everywhere, not just as query

Closes #903