Change quotes-plugin, fix a missing variable on main lib.

Add missing semicolon

Better upsert