Correctly handle keywords with quotes