Some updates to zenpage link handling

If all this works then we can make the zenpage tokens more general