Fixed benchmarks and added sim vs. query