Further fixes for intellidemand