Added timings and fixed query hasher generation.