Only include non-empty values