more tweaks on callbackURL support