Base: Properly handle URL field