Fixes #11, issue with query times that are > 1000 ms