Fixed url namespacing issues