Query Simulation files bug fix