Adding Querying by RecordState