More query examples, nav changes