Fix issue with has_data in xp manager
Fix missing pairs call in broker code