Fix to query to add organization ID right