Clean up and add additional check
Fix changes behavior in idb adapter
Fix changes behavior in websql adapter