Finish db queries at another spot
Amending commit 48c0b11ef and finish queries at another spot to resolve a problem I have with the SQLCIPHER version to update a DB of an older version.