add more keys/values to quickquery fix #19