Added url cleaning for spaces