Agreed.  This is on my agenda to fix properly with different timeouts for different types of requests.