window history fix
typo fix
unnecessary router call removed