Queries done

16 and 17 updated