Modified code to support URL database changes.