Fix some outdated sqlite query logic