Fixed: invalid URL generation