Improved conditional to load comments when genesis is loaded