keyword handling update