Refactored Query timeout (refs #102)