Major bug fix

Fixed major issue with comments setting overriding site-wide comments