add queryparser, fix quoting