convert more user queries to cached queries