Use consistent quoting in SQL and add missing comma in confirm window