Fixes URL builder