added 2 additional queries;increased timeout for oracle queries