Optimized PROPERTY_MATCH query

Optimized PROPERTY_MATCH query when returning vulnerabilities from
metadata