Hardcoded urls fix