Another fix for URL-less bulk tokens