CDB-3096 Ongoing href check and replacement