Fix return values for empty tokens fields