DirectHBM: Removed duplicate named query, addressed comment and whitespace issues