Change data store to file from in-memory
Increase limit of latest query