Bug - Security Services Tag repeats (due for r38)

We got reported that tags are repeated. Also certain filter convinations on security services (audits in particular) are broken, we’ll be fixing this two things for r38.