various improvements to benchmark script

now using server-side execution time + query timeout of 10s