Fix new research strong attributes
Fix formatting