keyword and quote updates