DirectHBM: Query fix for Certificate, other query changes for style consistency