*8497* Fix div/form ID collisions