Fine tuning H2H Query to guarantee at least a single environment and trait match : GCP-9736