Fixed a few bugs. Works now well with pdef service in calliope.