Active Directory Groups

I’m having trouble after upgrading to v3.3.

I have a group, ‘WildfireUsers’ that is the group I want to show up in client rosters. I have set up OpenFire to only display members of that group. Now I want to display some ActiveDirectory subgroups in the roster (‘HR’ or ‘IT’ for example), but if I enable contact list sharing in those AD groups, I get a bunch of “users” that are not really users, like templates and test accounts, etc. How can I set it up to only display users in BOTH groups, ‘HR’ and ‘WildfireUsers’ ?

Here is the <serchFields> string from OpenFire.conf:

<![CDATA[(&(objectCategory=person)(objectClass=user)(memberOf=cn=WildfireUser s,dc=foo,dc=bar)(!(userAccountControl:1.2.840.113556.1.4.803:=2))(!(sAMAccountNa me=$)))]]>

Thanks, in advance.

-Rob