Fix URL_Name Functionality