Fixed fields.Url to allow it to be used with blueprints

I cherry-picked the relevant commits from #316 and resolved the merge conflicts.