fixed serializers and added counteparty query