Added queries for #7 and #8