More Virgo improvements in internal Context Broker