Yes, that's a good idea.  However, I'm not sure it ought to be uniform - there are some services that always have longer query times, I think.  And it may depend on where you execute them from.  This may require further thought.... I guess as long as the timeout value is conservative (say, 5 minutes?  1 minute?) and we have progressbars to show if a query is really running, that should be OK.