switch to queries being synchronous by default to close #2