Reviewed improved Query section