Fix bug that overwrites query options for blocking timeout
Merge pull request #1 from gburton1/BugFix

Fix bug that overwrites query options for blocking timeout