multi tab issue fixes