Include more measures

In case we didn't find matching pair measure include just the quota
measure.
If we find a measure at non declarable commodity level include that
measure too.