I'd also put ClearGLASS under Applications. Kopano should go under Messaging or Applications, Openfire is the same. If they don't go under Messaging, Messaging should be renamed E-Mail. Database and Directory only ever seem to have one entry, but I think the MSSQL also went under Database (but it is now broken). There are issues with the IDS which appears in different places if you talk about the free or subscribed updates. Under Gateway, the Content Filter and Proxy and Filtering options need to be sorted because Content Filtering is Filtering. The list goes on.