RAZ-3045: Vulnerability with labels
- Query tweaks