Added time-out for queries and complete=y to ensure only complete datatsets are reported.