Fixing url builder