fixed keywords with question marks