cleaning and url fix