Fix some minor issues in GraphQL queries