Fix JSON schema of custom fields in query.