Tree Map Legend Label + Some Query filter issues resolved