collection filtering, tag splitting and organization_type added