added filtering locations by org_id