fixed an issue with the Organization query