Updated urls to trim url to base path'
'