Router update

Updated to support baseurl not set