now using 2 fields to handle envelope query