Added handling for extra level in urls.