[PRD-3281 & PRD-3833] - fix for URL generators and tooltip generators