Fixed several issues with:
 - query 3, 6, 7, 10 and 11 descriptions
 - schema definition
 - minor typos