Fix bug with record.data.*
after record queries
#298
Merged
record.data.*
after record queries
#298