Typo
Added tags to list of automatically included attributes
Updated lists to use - prefix instead