more table bugs fixes