CDB-3096 Started rewriting URLs for the new format