Found some more places where ES DB needs to be updated, and fixed them