Fixing scenaio for changeing lcoation where the page was navigated