#18 query update + test