Fixes Certificate Generation query